Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local

(This used to be commit 400c16e7004bc3a881bb6efb99a273cdac87f70c)

diff --combined source4/heimdal_build/config.mk
index 34d3f4bfa57aaed2efdce539c1c3e861e889f069,e6bb73a385eba3a93fda06d5a60b87a341f32823..65b49b73dbd496820c5eb427482b9b9618af500b
--- 1/source4/heimdal_build/config.mk
--- 2/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@@ -40,7 -40,6 +40,7 @@@ PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HE
  CFLAGS = -Iheimdal_build -Iheimdal/lib/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 \
@@@ -171,7 -170,7 +171,7 @@@ PUBLIC_DEPENDENCIES = HEIMDAL_ROKEN HEI
  # 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 \
@@@ -324,9 -323,7 +324,9 @@@ OBJ_FILES = 
        ../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/hmac.o \
 +      ../heimdal/lib/hcrypto/camellia.o \
 +      ../heimdal/lib/hcrypto/camellia-ntt.o
  # End SUBSYSTEM HEIMDAL_HCRYPTO
  #######################
  
@@@ -340,8 -337,7 +340,8 @@@ 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 \
@@@ -369,30 -365,6 +369,30 @@@
  # End SUBSYSTEM HEIMDAL_HX509
  #######################
  
 +#######################
 +# Start SUBSYSTEM HEIMDAL_WIND
 +[SUBSYSTEM::HEIMDAL_WIND]
 +CFLAGS = -Iheimdal_build -Iheimdal/lib/wind 
 +PRIVATE_DEPENDENCIES = \
 +      HEIMDAL_ROKEN HEIMDAL_COM_ERR
 +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
@@@ -443,7 -415,7 +443,7 @@@ PUBLIC_DEPENDENCIES = 
                        HEIMDAL_ROKEN_GETPROGNAME \
                        HEIMDAL_ROKEN_CLOSEFROM \
                        RESOLV \
-                       EXT_SOCKET
+                       LIBREPLACE_NETWORK
  # End SUBSYSTEM HEIMDAL_ROKEN
  #######################
  
@@@ -503,7 -475,7 +503,7 @@@ OBJ_FILES = 
        ../heimdal/lib/vers/print_version.ho \
        ../lib/socket_wrapper/socket_wrapper.ho \
        replace.ho
- PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H EXT_SOCKET EXT_NSL
+ PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK
  
  # End BINARY asn1_compile
  #######################
@@@ -530,7 -502,7 +530,7 @@@ OBJ_FILES = ../heimdal/lib/vers/print_v
        ../heimdal/lib/roken/setprogname.ho \
        ../lib/socket_wrapper/socket_wrapper.ho \
        replace.ho
- PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H EXT_SOCKET EXT_NSL
+ PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK
  # End BINARY compile_et
  #######################
  
@@@ -560,7 -532,6 +560,7 @@@ mkinclude perl_path_wrapper.sh et_deps.
  mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb5_err.et heimdal/lib/krb5|
  mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/gssapi/krb5/gkrb5_err.et heimdal/lib/gssapi|
  mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/hx509/hx509_err.et heimdal/lib/hx509|
 +mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/wind/wind_err.et heimdal/lib/wind|
  
  clean::       
        @-rm -f bin/compile_et bin/asn1_compile