Merge v4.0-test

(This used to be commit 977dbdeaf363c8905ed9fd0570eba4be80582833)

diff --cc source4/build/m4/public.m4
index 604092c8d7213effc2a444d92520fd7cb9b04c09,eb673446c7af1e1d5024184b8718f3d8e5576f1a..0058afe2b51ec48c140e4c63622eba60b1ec166c
--- 1/source4/build/m4/public.m4
--- 2/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@@ -39,13 -40,13 +39,13 @@@ ENABLE = YE
  "
  ])
  
--dnl SMB_LIBRARY(name,obj_files,required_subsystems,version,so_version,cflags,ldflags)
++dnl SMB_LIBRARY(name,obj_files,required_subsystems,cflags,ldflags)
  AC_DEFUN([SMB_LIBRARY],
  [
  MAKE_SETTINGS="$MAKE_SETTINGS
  $1_OBJ_FILES = $2
--$1_CFLAGS = $6
--$1_LDFLAGS = $7
++$1_CFLAGS = $4
++$1_LDFLAGS = $5
  $1_ENABLE = YES
  "
  
@@@ -53,9 -54,10 +53,7 @@@ SMB_INFO_LIBRARIES="$SMB_INFO_LIBRARIE
  ###################################
  # Start Library $1
  @<:@LIBRARY::$1@:>@
 -OBJ_FILES = \$($1_OBJ_FILES)
  PRIVATE_DEPENDENCIES = $3
--VERSION = $4
--SO_VERSION = $5 
  CFLAGS = \$($1_CFLAGS)
  LDFLAGS = \$($1_LDFLAGS)
  ENABLE = YES

diff --cc source4/heimdal_build/config.mk
index d3d87f7a70f4ed28971131f711fde208430635f7,65b49b73dbd496820c5eb427482b9b9618af500b..d58d06f909b808857cca81b50fc7968f853b0c6a
--- 1/source4/heimdal_build/config.mk
--- 2/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@@ -44,15 -51,6 +44,16 @@@ PRIVATE_DEPENDENCIES = HDB_LDB HEIMDAL_
  # End SUBSYSTEM HEIMDAL_HDB
  #######################
  
 +HEIMDAL_HDB_OBJ_FILES = \
 +      ./heimdal/lib/hdb/db.o \
++      ./heimdal/lib/hdb/dbinfo.o \
 +      ./heimdal/lib/hdb/hdb.o \
 +      ./heimdal/lib/hdb/ext.o \
 +      ./heimdal/lib/hdb/keytab.o \
 +      ./heimdal/lib/hdb/mkey.o \
 +      ./heimdal/lib/hdb/ndbm.o \
 +      ./heimdal/lib/hdb/hdb_err.o
 +
  #######################
  # Start SUBSYSTEM HEIMDAL_GSSAPI
  [SUBSYSTEM::HEIMDAL_GSSAPI]
@@@ -175,8 -171,95 +176,8 @@@ HEIMDAL_GSSAPI_OBJ_FILES = 
  # Start SUBSYSTEM HEIMDAL_KRB5
  [SUBSYSTEM::HEIMDAL_KRB5]
  CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 
- PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1
+ PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND
  PUBLIC_DEPENDENCIES = HEIMDAL_KRB5_ASN1 HEIMDAL_GLUE HEIMDAL_HX509 HEIMDAL_HCRYPTO
 -OBJ_FILES = \
 -      ../heimdal/lib/krb5/acache.o \
 -      ../heimdal/lib/krb5/add_et_list.o \
 -      ../heimdal/lib/krb5/addr_families.o \
 -      ../heimdal/lib/krb5/appdefault.o \
 -      ../heimdal/lib/krb5/asn1_glue.o \
 -      ../heimdal/lib/krb5/auth_context.o \
 -      ../heimdal/lib/krb5/build_ap_req.o \
 -      ../heimdal/lib/krb5/build_auth.o \
 -      ../heimdal/lib/krb5/cache.o \
 -      ../heimdal/lib/krb5/changepw.o \
 -      ../heimdal/lib/krb5/codec.o \
 -      ../heimdal/lib/krb5/config_file.o \
 -      ../heimdal/lib/krb5/config_file_netinfo.o \
 -      ../heimdal/lib/krb5/constants.o \
 -      ../heimdal/lib/krb5/context.o \
 -      ../heimdal/lib/krb5/convert_creds.o \
 -      ../heimdal/lib/krb5/copy_host_realm.o \
 -      ../heimdal/lib/krb5/crc.o \
 -      ../heimdal/lib/krb5/creds.o \
 -      ../heimdal/lib/krb5/crypto.o \
 -      ../heimdal/lib/krb5/data.o \
 -      ../heimdal/lib/krb5/eai_to_heim_errno.o \
 -      ../heimdal/lib/krb5/error_string.o \
 -      ../heimdal/lib/krb5/expand_hostname.o \
 -      ../heimdal/lib/krb5/fcache.o \
 -      ../heimdal/lib/krb5/free.o \
 -      ../heimdal/lib/krb5/free_host_realm.o \
 -      ../heimdal/lib/krb5/generate_seq_number.o \
 -      ../heimdal/lib/krb5/generate_subkey.o \
 -      ../heimdal/lib/krb5/get_cred.o \
 -      ../heimdal/lib/krb5/get_default_principal.o \
 -      ../heimdal/lib/krb5/get_default_realm.o \
 -      ../heimdal/lib/krb5/get_for_creds.o \
 -      ../heimdal/lib/krb5/get_host_realm.o \
 -      ../heimdal/lib/krb5/get_in_tkt.o \
 -      ../heimdal/lib/krb5/get_in_tkt_with_keytab.o \
 -      ../heimdal/lib/krb5/get_port.o \
 -      ../heimdal/lib/krb5/init_creds.o \
 -      ../heimdal/lib/krb5/init_creds_pw.o \
 -      ../heimdal/lib/krb5/kcm.o \
 -      ../heimdal/lib/krb5/keyblock.o \
 -      ../heimdal/lib/krb5/keytab.o \
 -      ../heimdal/lib/krb5/keytab_any.o \
 -      ../heimdal/lib/krb5/keytab_file.o \
 -      ../heimdal/lib/krb5/keytab_memory.o \
 -      ../heimdal/lib/krb5/keytab_keyfile.o \
 -      ../heimdal/lib/krb5/keytab_krb4.o \
 -      ../heimdal/lib/krb5/krbhst.o \
 -      ../heimdal/lib/krb5/log.o \
 -      ../heimdal/lib/krb5/mcache.o \
 -      ../heimdal/lib/krb5/misc.o \
 -      ../heimdal/lib/krb5/mk_error.o \
 -      ../heimdal/lib/krb5/mk_priv.o \
 -      ../heimdal/lib/krb5/mk_rep.o \
 -      ../heimdal/lib/krb5/mk_req.o \
 -      ../heimdal/lib/krb5/mk_req_ext.o \
 -      ../heimdal/lib/krb5/mit_glue.o \
 -      ../heimdal/lib/krb5/n-fold.o \
 -      ../heimdal/lib/krb5/padata.o \
 -      ../heimdal/lib/krb5/pkinit.o \
 -      ../heimdal/lib/krb5/plugin.o \
 -      ../heimdal/lib/krb5/principal.o \
 -      ../heimdal/lib/krb5/pac.o \
 -      ../heimdal/lib/krb5/prompter_posix.o \
 -      ../heimdal/lib/krb5/rd_cred.o \
 -      ../heimdal/lib/krb5/rd_error.o \
 -      ../heimdal/lib/krb5/rd_priv.o \
 -      ../heimdal/lib/krb5/rd_rep.o \
 -      ../heimdal/lib/krb5/rd_req.o \
 -      ../heimdal/lib/krb5/replay.o \
 -      ../heimdal/lib/krb5/send_to_kdc.o \
 -      ../heimdal/lib/krb5/set_default_realm.o \
 -      ../heimdal/lib/krb5/store.o \
 -      ../heimdal/lib/krb5/store_emem.o \
 -      ../heimdal/lib/krb5/store_fd.o \
 -      ../heimdal/lib/krb5/store_mem.o \
 -      ../heimdal/lib/krb5/ticket.o \
 -      ../heimdal/lib/krb5/time.o \
 -      ../heimdal/lib/krb5/transited.o \
 -      ../heimdal/lib/krb5/v4_glue.o \
 -      ../heimdal/lib/krb5/version.o \
 -      ../heimdal/lib/krb5/warn.o \
 -      ../heimdal/lib/krb5/krb5_err.o \
 -      ../heimdal/lib/krb5/heim_err.o \
 -      ../heimdal/lib/krb5/k524_err.o \
 -      ../heimdal/lib/krb5/krb_err.o
  # End SUBSYSTEM HEIMDAL_KRB5
  #######################
  
@@@ -306,37 -299,37 +307,38 @@@ PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HE
  # End SUBSYSTEM HEIMDAL_HCRYPTO
  #######################
  
-       ./heimdal/lib/hcrypto/hmac.o
- 
 +HEIMDAL_HCRYPTO_OBJ_FILES = \
 +      ./heimdal/lib/hcrypto/aes.o \
 +      ./heimdal/lib/hcrypto/bn.o \
 +      ./heimdal/lib/hcrypto/dh.o \
 +      ./heimdal/lib/hcrypto/dh-imath.o \
 +      ./heimdal/lib/hcrypto/des.o \
 +      ./heimdal/lib/hcrypto/dsa.o \
 +      ./heimdal/lib/hcrypto/engine.o \
 +      ./heimdal/lib/hcrypto/md2.o \
 +      ./heimdal/lib/hcrypto/md4.o \
 +      ./heimdal/lib/hcrypto/md5.o \
 +      ./heimdal/lib/hcrypto/rsa.o \
 +      ./heimdal/lib/hcrypto/rsa-imath.o \
 +      ./heimdal/lib/hcrypto/rc2.o \
 +      ./heimdal/lib/hcrypto/rc4.o \
 +      ./heimdal/lib/hcrypto/rijndael-alg-fst.o \
 +      ./heimdal/lib/hcrypto/rnd_keys.o \
 +      ./heimdal/lib/hcrypto/sha.o \
 +      ./heimdal/lib/hcrypto/sha256.o \
 +      ./heimdal/lib/hcrypto/ui.o \
 +      ./heimdal/lib/hcrypto/evp.o \
 +      ./heimdal/lib/hcrypto/pkcs5.o \
 +      ./heimdal/lib/hcrypto/pkcs12.o \
 +      ./heimdal/lib/hcrypto/rand.o \
 +      ./heimdal/lib/hcrypto/rand-egd.o \
 +      ./heimdal/lib/hcrypto/rand-unix.o \
 +      ./heimdal/lib/hcrypto/rand-fortuna.o \
 +      ./heimdal/lib/hcrypto/rand-timer.o \
++      ./heimdal/lib/hcrypto/hmac.o \
++      ./heimdal/lib/hcrypto/camellia.o \
++      ./heimdal/lib/hcrypto/camellia-ntt.o
 +
  #######################
  # Start SUBSYSTEM HEIMDAL_HX509
  [SUBSYSTEM::HEIMDAL_HX509]
@@@ -347,39 -340,62 +349,65 @@@ PRIVATE_DEPENDENCIES = 
        HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 \
        HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 \
        HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1 \
-       HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1
+       HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1 \
+       HEIMDAL_WIND
 -OBJ_FILES = \
 -      ../heimdal/lib/hx509/ca.o \
 -      ../heimdal/lib/hx509/cert.o \
 -      ../heimdal/lib/hx509/cms.o \
 -      ../heimdal/lib/hx509/collector.o \
 -      ../heimdal/lib/hx509/crypto.o \
 -      ../heimdal/lib/hx509/error.o \
 -      ../heimdal/lib/hx509/env.o \
 -      ../heimdal/lib/hx509/file.o \
 -      ../heimdal/lib/hx509/keyset.o \
 -      ../heimdal/lib/hx509/ks_dir.o \
 -      ../heimdal/lib/hx509/ks_file.o \
 -      ../heimdal/lib/hx509/ks_keychain.o \
 -      ../heimdal/lib/hx509/ks_mem.o \
 -      ../heimdal/lib/hx509/ks_null.o \
 -      ../heimdal/lib/hx509/ks_p11.o \
 -      ../heimdal/lib/hx509/ks_p12.o \
 -      ../heimdal/lib/hx509/lock.o \
 -      ../heimdal/lib/hx509/name.o \
 -      ../heimdal/lib/hx509/peer.o \
 -      ../heimdal/lib/hx509/print.o \
 -      ../heimdal/lib/hx509/req.o \
 -      ../heimdal/lib/hx509/revoke.o \
 -      ../heimdal/lib/hx509/hx509_err.o
  # End SUBSYSTEM HEIMDAL_HX509
  #######################
  
 -OBJ_FILES = \
 -      ../heimdal/lib/wind/wind_err.o \
 -      ../heimdal/lib/wind/stringprep.o \
 -      ../heimdal/lib/wind/errorlist.o \
 -      ../heimdal/lib/wind/errorlist_table.o \
 -      ../heimdal/lib/wind/normalize.o \
 -      ../heimdal/lib/wind/normalize_table.o \
 -      ../heimdal/lib/wind/combining.o \
 -      ../heimdal/lib/wind/combining_table.o \
 -      ../heimdal/lib/wind/utf8.o \
 -      ../heimdal/lib/wind/bidi.o \
 -      ../heimdal/lib/wind/bidi_table.o \
 -      ../heimdal/lib/wind/ldap.o \
 -      ../heimdal/lib/wind/map.o \
 -      ../heimdal/lib/wind/map_table.o
 +HEIMDAL_HX509_OBJ_FILES = \
 +      ./heimdal/lib/hx509/ca.o \
 +      ./heimdal/lib/hx509/cert.o \
 +      ./heimdal/lib/hx509/cms.o \
 +      ./heimdal/lib/hx509/collector.o \
 +      ./heimdal/lib/hx509/crypto.o \
 +      ./heimdal/lib/hx509/error.o \
 +      ./heimdal/lib/hx509/env.o \
 +      ./heimdal/lib/hx509/file.o \
 +      ./heimdal/lib/hx509/keyset.o \
 +      ./heimdal/lib/hx509/ks_dir.o \
 +      ./heimdal/lib/hx509/ks_file.o \
 +      ./heimdal/lib/hx509/ks_keychain.o \
 +      ./heimdal/lib/hx509/ks_mem.o \
 +      ./heimdal/lib/hx509/ks_null.o \
 +      ./heimdal/lib/hx509/ks_p11.o \
 +      ./heimdal/lib/hx509/ks_p12.o \
 +      ./heimdal/lib/hx509/lock.o \
 +      ./heimdal/lib/hx509/name.o \
 +      ./heimdal/lib/hx509/peer.o \
 +      ./heimdal/lib/hx509/print.o \
 +      ./heimdal/lib/hx509/req.o \
 +      ./heimdal/lib/hx509/revoke.o \
 +      ./heimdal/lib/hx509/hx509_err.o
 +
+ #######################
+ # Start SUBSYSTEM HEIMDAL_WIND
+ [SUBSYSTEM::HEIMDAL_WIND]
+ CFLAGS = -Iheimdal_build -Iheimdal/lib/wind 
+ PRIVATE_DEPENDENCIES = \
+       HEIMDAL_ROKEN HEIMDAL_COM_ERR
++
++HEIMDAL_WIND_OBJ_FILES = \
++      ./heimdal/lib/wind/wind_err.o \
++      ./heimdal/lib/wind/stringprep.o \
++      ./heimdal/lib/wind/errorlist.o \
++      ./heimdal/lib/wind/errorlist_table.o \
++      ./heimdal/lib/wind/normalize.o \
++      ./heimdal/lib/wind/normalize_table.o \
++      ./heimdal/lib/wind/combining.o \
++      ./heimdal/lib/wind/combining_table.o \
++      ./heimdal/lib/wind/utf8.o \
++      ./heimdal/lib/wind/bidi.o \
++      ./heimdal/lib/wind/bidi_table.o \
++      ./heimdal/lib/wind/ldap.o \
++      ./heimdal/lib/wind/map.o \
++      ./heimdal/lib/wind/map_table.o
+ # End SUBSYSTEM HEIMDAL_WIND
+ #######################
+ 
  [SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME]
  CFLAGS = -Iheimdal_build -Iheimdal/lib/roken  -Ilib/socket_wrapper
 -OBJ_FILES = ../heimdal/lib/roken/getprogname.o
 +
 +HEIMDAL_ROKEN_GETPROGNAME_OBJ_FILES = ./heimdal/lib/roken/getprogname.o
  
  [SUBSYSTEM::HEIMDAL_ROKEN_CLOSEFROM] 
  CFLAGS = -Iheimdal_build -Iheimdal/lib/roken  -Ilib/socket_wrapper
@@@ -470,32 -480,31 +498,32 @@@ HEIMDAL_ASN1_COMPILE_LEX_OBJ_FILES = ./
  [BINARY::asn1_compile]
  CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
  USE_HOSTCC = YES
- PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H EXT_SOCKET EXT_NSL
 -OBJ_FILES = \
 -      ../heimdal/lib/asn1/main.ho \
 -      ../heimdal/lib/asn1/gen.ho \
 -      ../heimdal/lib/asn1/gen_copy.ho \
 -      ../heimdal/lib/asn1/gen_decode.ho \
 -      ../heimdal/lib/asn1/gen_encode.ho \
 -      ../heimdal/lib/asn1/gen_free.ho \
 -      ../heimdal/lib/asn1/gen_glue.ho \
 -      ../heimdal/lib/asn1/gen_length.ho \
 -      ../heimdal/lib/asn1/gen_seq.ho \
 -      ../heimdal/lib/asn1/hash.ho \
 -      ../heimdal/lib/asn1/parse.ho \
 -      ../heimdal/lib/roken/emalloc.ho \
 -      ../heimdal/lib/roken/getarg.ho \
 -      ../heimdal/lib/roken/setprogname.ho \
 -      ../heimdal/lib/roken/strupr.ho \
 -      ../heimdal/lib/roken/get_window_size.ho \
 -      ../heimdal/lib/roken/estrdup.ho \
 -      ../heimdal/lib/roken/ecalloc.ho \
 -      ../heimdal/lib/asn1/symbol.ho \
 -      ../heimdal/lib/vers/print_version.ho \
 -      ../lib/socket_wrapper/socket_wrapper.ho \
 -      replace.ho
+ PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK
  
 +asn1_compile_OBJ_FILES = \
 +      ./heimdal/lib/asn1/main.ho \
 +      ./heimdal/lib/asn1/gen.ho \
 +      ./heimdal/lib/asn1/gen_copy.ho \
 +      ./heimdal/lib/asn1/gen_decode.ho \
 +      ./heimdal/lib/asn1/gen_encode.ho \
 +      ./heimdal/lib/asn1/gen_free.ho \
 +      ./heimdal/lib/asn1/gen_glue.ho \
 +      ./heimdal/lib/asn1/gen_length.ho \
 +      ./heimdal/lib/asn1/gen_seq.ho \
 +      ./heimdal/lib/asn1/hash.ho \
 +      ./heimdal/lib/asn1/parse.ho \
 +      ./heimdal/lib/roken/emalloc.ho \
 +      ./heimdal/lib/roken/getarg.ho \
 +      ./heimdal/lib/roken/setprogname.ho \
 +      ./heimdal/lib/roken/strupr.ho \
 +      ./heimdal/lib/roken/get_window_size.ho \
 +      ./heimdal/lib/roken/estrdup.ho \
 +      ./heimdal/lib/roken/ecalloc.ho \
 +      ./heimdal/lib/asn1/symbol.ho \
 +      ./heimdal/lib/vers/print_version.ho \
 +      ./lib/socket_wrapper/socket_wrapper.ho \
 +      ./heimdal_build/replace.ho
 +
  # End BINARY asn1_compile
  #######################
  
@@@ -513,7 -521,16 +541,7 @@@ HEIMDAL_COM_ERR_COMPILE_LEX_OBJ_FILES 
  [BINARY::compile_et]
  CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
  USE_HOSTCC = YES
- PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H EXT_SOCKET EXT_NSL
 -OBJ_FILES = ../heimdal/lib/vers/print_version.ho \
 -      ../heimdal/lib/com_err/parse.ho \
 -      ../heimdal/lib/com_err/compile_et.ho \
 -      ../heimdal/lib/roken/getarg.ho \
 -      ../heimdal/lib/roken/get_window_size.ho \
 -      ../heimdal/lib/roken/strupr.ho \
 -      ../heimdal/lib/roken/setprogname.ho \
 -      ../lib/socket_wrapper/socket_wrapper.ho \
 -      replace.ho
+ PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK
  # End BINARY compile_et
  #######################
  

diff --cc source4/lib/ldb/include/ldb_private.h
Simple merge

diff --cc source4/lib/socket/config.mk
index 354b1b51986000d79b7711367131d1d35eb5a7e9,777882f6e06930540cd95f14eaf542f9824a9200..240019017545e9daf352e99d442377230bc929ca
--- 1/source4/lib/socket/config.mk
--- 2/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@@ -2,7 -2,10 +2,7 @@@
  # Start SUBSYSTEM LIBNETIF
  [SUBSYSTEM::LIBNETIF]
  PRIVATE_PROTO_HEADER = netif_proto.h
- PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL EXT_SOCKET EXT_NSL
 -OBJ_FILES = \
 -              interface.o \
 -              netif.o
+ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBREPLACE_NETWORK
  # End SUBSYSTEM LIBNETIF
  ##############################
  
@@@ -13,7 -14,9 +13,7 @@@ LIBNETIF_OBJ_FILES = $(addprefix lib/so
  [MODULE::socket_ip]
  SUBSYSTEM = samba-socket
  OUTPUT_TYPE = MERGED_OBJ
- PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL LIBSAMBA-ERRORS 
 -OBJ_FILES = \
 -              socket_ip.o
+ PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS LIBREPLACE_NETWORK
  # End MODULE socket_ip
  ################################################
  
@@@ -24,7 -25,9 +24,7 @@@ socket_ip_OBJ_FILES = lib/socket/socket
  [MODULE::socket_unix]
  SUBSYSTEM = samba-socket
  OUTPUT_TYPE = MERGED_OBJ
- PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL
 -OBJ_FILES = \
 -              socket_unix.o
+ PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK
  # End MODULE socket_unix
  ################################################
  

diff --cc source4/lib/socket_wrapper/config.mk
index f7e874d8e28e91264a6975adcbeea55fbf87cd48,2b9f30a7bbce16dcedf380cf77a0e695aff74063..75d3ade28b0eed2830793015c80514b0b4d96e10
--- 1/source4/lib/socket_wrapper/config.mk
--- 2/source4/lib/socket_wrapper/config.mk
+++ b/source4/lib/socket_wrapper/config.mk
@@@ -1,7 -1,8 +1,7 @@@
  ##############################
  # Start SUBSYSTEM SOCKET_WRAPPER
  [SUBSYSTEM::SOCKET_WRAPPER]
- PRIVATE_DEPENDENCIES = EXT_SOCKET
 -OBJ_FILES = socket_wrapper.o
+ PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK
  # End SUBSYSTEM SOCKET_WRAPPER
  ##############################
  

diff --cc source4/lib/util/config.mk
index b0978ca5f5a241f63d3e4bf271c39e82fe4342bc,22e6617f7cb0df2fb870bedd6bdc30269dea1271..3afe398a8f38ae924fce5567b3e19526fad08612
--- 1/source4/lib/util/config.mk
--- 2/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@@ -1,11 -1,7 +1,12 @@@
  [SUBSYSTEM::LIBSAMBA-UTIL]
 -#VERSION = 0.0.1
 -#SO_VERSION = 0
 -OBJ_FILES = xfile.o \
 +PUBLIC_DEPENDENCIES = \
 +              LIBTALLOC LIBCRYPTO \
 +              SOCKET_WRAPPER EXT_NSL \
-               CHARSET EXECINFO DYNCONFIG
++              CHARSET EXECINFO DYNCONFIG \
++              LIBREPLACE_NETWORK
 +
 +LIBSAMBA-UTIL_OBJ_FILES = $(addprefix lib/util/, \
 +      xfile.o \
                debug.o \
                fault.o \
                signal.o \
@@@ -36,9 -36,8 +37,8 @@@ PUBLIC_HEADERS += $(addprefix lib/util/
  
  [SUBSYSTEM::ASN1_UTIL]
  PRIVATE_PROTO_HEADER = asn1_proto.h
 -OBJ_FILES = asn1.o
  
- 
 +ASN1_UTIL_OBJ_FILES = lib/util/asn1.o
  PUBLIC_HEADERS += lib/util/asn1.h
  
  [SUBSYSTEM::UNIX_PRIVS]

diff --cc source4/librpc/config.mk
index 682a3b81cde7970e4709e945dd78bd70fe950021,a316e059b3da8f01f9cbbb0ea2e6fc04f0e790ff..bb81888d1276365a98fbbc8f141507ca4f4e7858
--- 1/source4/librpc/config.mk
--- 2/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@@ -1,16 -1,17 +1,16 @@@
  ################################################
  # Start SUBSYSTEM LIBNDR
  [LIBRARY::LIBNDR]
 -VERSION = 0.0.1
 -SO_VERSION = 0
 -PC_FILE = ndr.pc
  PRIVATE_PROTO_HEADER = ndr/libndr_proto.h
- PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET EXT_NSL \
 -OBJ_FILES = \
 -              ndr/ndr.o \
 -              ndr/ndr_basic.o \
 -              ndr/ndr_string.o \
 -              ndr/uuid.o
+ PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET \
                                          LIBSAMBA-CONFIG
 +
 +LIBNDR_OBJ_FILES = $(addprefix librpc/ndr/, ndr.o ndr_basic.o ndr_string.o uuid.o)
 +
 +PC_FILES += librpc/ndr.pc
 +LIBNDR_VERSION = 0.0.1
 +LIBNDR_SOVERSION = 0
 +
  # End SUBSYSTEM LIBNDR
  ################################################
  

diff --cc source4/nsswitch/config.m4
index a3b74128416fb413d2657a4d7ede7c10070b6f64,a3b74128416fb413d2657a4d7ede7c10070b6f64..207b7fa53ff5d3e7f6609cd2d0ea21725683ac02
--- 1/source4/nsswitch/config.m4
--- 2/source4/nsswitch/config.m4
+++ b/source4/nsswitch/config.m4
@@@ -4,8 -4,8 +4,7 @@@ case "$host_os" i
        *linux*)
                SMB_LIBRARY(nss_winbind,
                            [nsswitch/winbind_nss_linux.o],
--                          [LIBWINBIND-CLIENT],
--                          [2],[2])
++                          [LIBWINBIND-CLIENT])
        ;;
        *)
        ;;

diff --cc source4/ntvfs/common/config.mk
index 356f6465c3bd0f594e2e24a484f259a2fd95b765,3963ebcdee46f5660bf5308a9ab7e677da147ed7..c66257b73f73ba87eb036f3c7749025d90ade0a9
--- 1/source4/ntvfs/common/config.mk
--- 2/source4/ntvfs/common/config.mk
+++ b/source4/ntvfs/common/config.mk
@@@ -2,7 -2,17 +2,7 @@@
  # Start LIBRARY ntvfs_common
  [SUBSYSTEM::ntvfs_common]
  PRIVATE_PROTO_HEADER = proto.h
- PUBLIC_DEPENDENCIES = NDR_OPENDB NDR_NOTIFY sys_notify share LIBDBWRAP
 -OBJ_FILES = \
 -              init.o \
 -              brlock.o \
 -              brlock_tdb.o \
 -              opendb.o \
 -              opendb_tdb.o \
 -              notify.o
 -PUBLIC_DEPENDENCIES = \
 -              NDR_OPENDB NDR_NOTIFY \
 -              sys_notify sys_lease \
 -              share LIBDBWRAP
++PUBLIC_DEPENDENCIES = NDR_OPENDB NDR_NOTIFY sys_notify sys_lease share LIBDBWRAP
  PRIVATE_DEPENDENCIES = brlock_ctdb opendb_ctdb
  # End LIBRARY ntvfs_common
  ################################################

diff --cc source4/ntvfs/sysdep/config.mk
index 6cd5d88aca22e589581344b689d20df93190efed,048226efad14cd563bc39151048dc15532b1d851..68be660049e39a2a3fdec481e6f0fe39ca25d89c
--- 1/source4/ntvfs/sysdep/config.mk
--- 2/source4/ntvfs/sysdep/config.mk
+++ b/source4/ntvfs/sysdep/config.mk
@@@ -14,4 -14,23 +14,12 @@@ sys_notify_inotify_OBJ_FILES = ntvfs/sy
  # End SUBSYSTEM sys_notify
  ################################################
  
 -################################################
 -# Start MODULE sys_lease_linux
 -[MODULE::sys_lease_linux]
 -SUBSYSTEM = sys_lease
 -INIT_FUNCTION = sys_lease_linux_init
 -OBJ_FILES = \
 -              sys_lease_linux.o
 -# End MODULE sys_lease_linux
 -################################################
 +sys_notify_OBJ_FILES = ntvfs/sysdep/sys_notify.o
++
++[SUBSYSTEM::sys_lease_linux]
++
++sys_lease_linux_OBJ_FILES = ntvfs/sysdep/sys_lease_linux.o
+ 
 -################################################
 -# Start SUBSYSTEM sys_lease
+ [SUBSYSTEM::sys_lease]
 -OBJ_FILES = \
 -              sys_lease.o
 -# End SUBSYSTEM sys_lease
 -################################################
++
++sys_lease_OBJ_FILES = ntvfs/sysdep/sys_lease.o

diff --cc source4/winbind/config.mk
Simple merge