r26136: Attempt to fix dependencies for auth.

(This used to be commit abf2600a044cdbab6c5d7880d18217bff3d15c39)

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 2e9b2d86ce7b4276549ddb9b904a7c48e36945f9..58bc7ce9ba4788c3cc9e3323934b6df380b5792d 100644 (file)
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -80,7 +80,6 @@ OBJ_FILES = \
                auth_util.o \
                auth_simple.o
 PUBLIC_DEPENDENCIES = LIBSECURITY SAMDB CREDENTIALS
-PRIVATE_DEPENDENCIES = auth_session auth_system_session
 # End SUBSYSTEM auth
 #######################
 

diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index b358011135bdf576c6de1a133f12cee16d7e6009..17954bbe5088183a83da4d8bcc47c0cfa18ed79b 100644 (file)
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -28,7 +28,7 @@ PRIVATE_DEPENDENCIES = CREDENTIALS_KRB5 KERBEROS auth auth_sam
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_gssapi_init
 OBJ_FILES = gensec_gssapi.o 
-PRIVATE_DEPENDENCIES = HEIMDAL_GSSAPI CREDENTIALS_KRB5 KERBEROS auth
+PRIVATE_DEPENDENCIES = HEIMDAL_GSSAPI CREDENTIALS_KRB5 KERBEROS 
 # End MODULE gensec_gssapi
 ################################################
 
@@ -38,7 +38,7 @@ PRIVATE_DEPENDENCIES = HEIMDAL_GSSAPI CREDENTIALS_KRB5 KERBEROS auth
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_sasl_init
 OBJ_FILES = cyrus_sasl.o 
-PRIVATE_DEPENDENCIES = CREDENTIALS SASL auth
+PRIVATE_DEPENDENCIES = CREDENTIALS SASL 
 # End MODULE cyrus_sasl
 ################################################
 
@@ -61,7 +61,7 @@ PRIVATE_PROTO_HEADER = schannel_proto.h
 INIT_FUNCTION = gensec_schannel_init
 OBJ_FILES = schannel.o \
                        schannel_sign.o
-PRIVATE_DEPENDENCIES = auth SCHANNELDB NDR_SCHANNEL CREDENTIALS
+PRIVATE_DEPENDENCIES = SCHANNELDB NDR_SCHANNEL CREDENTIALS
 OUTPUT_TYPE = INTEGRATED
 # End MODULE gensec_schannel
 ################################################

diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
index 9ef3ee9623c99bb713c70e13f4f65af9239509c7..cb51dc9fa1144b1bcbad7734c10525e544bcc1b7 100644 (file)
--- a/source4/auth/ntlmssp/config.mk
+++ b/source4/auth/ntlmssp/config.mk
@@ -12,7 +12,7 @@ OBJ_FILES = ntlmssp.o \
                ntlmssp_sign.o \
                ntlmssp_client.o \
                ntlmssp_server.o
-PRIVATE_DEPENDENCIES = auth MSRPC_PARSE
+PRIVATE_DEPENDENCIES = MSRPC_PARSE
 OUTPUT_TYPE = INTEGRATED
 # End MODULE gensec_ntlmssp
 ################################################

diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index 56a8f532b18ba2609f5592eb600900e9267276a9..77a9085f0e9e6ba1c87ed9e4393e6f697c585597 100644 (file)
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -8,7 +8,8 @@ include samdb/ldb_modules/config.mk
 PUBLIC_PROTO_HEADER = samdb/samdb_proto.h
 PUBLIC_HEADERS = samdb/samdb.h
 PUBLIC_DEPENDENCIES = LIBCLI_LDAP HEIMDAL_KRB5 
-PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER
+PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \
+                                          auth_system_session
 OBJ_FILES = \
                samdb/samdb.o \
                samdb/samdb_privilege.o \

diff --git a/source4/ldap_server/config.mk b/source4/ldap_server/config.mk
index 9aa7aae9f0365321340890b04427b06a473d78ce..51650a116fedac9649563532e5a377ddf6963e80 100644 (file)
--- a/source4/ldap_server/config.mk
+++ b/source4/ldap_server/config.mk
@@ -13,7 +13,7 @@ OBJ_FILES = \
                ldap_extended.o
 PRIVATE_DEPENDENCIES = CREDENTIALS \
                LIBCLI_LDAP SAMDB \
-               process_model auth \
+               process_model \
                GENSEC_SOCKET
 # End SUBSYSTEM SMB
 #######################

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index d7aaac04479e5334d5f4f3b030b700efb2d15dc5..3bfc1478bc3bcd26074d8291625683cafcada425 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -34,7 +34,7 @@ OBJ_FILES = \
        smb_composite/fetchfile.o \
        smb_composite/appendacl.o \
        smb_composite/fsinfo.o 
-PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE CREDENTIALS
+PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE CREDENTIALS gensec
 
 [SUBSYSTEM::NDR_NBT_BUF]
 PRIVATE_PROTO_HEADER = nbt/nbtname.h

diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index e5a7133cfa49213c2fe0209bad4af651ae39c2a8..adccd23eb19414caf2415d7eadba275494018a37 100644 (file)
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -1,5 +1,3 @@
-#################################
-# Start SUBSYSTEM LIBCLI_LDAP
 [SUBSYSTEM::LIBCLI_LDAP]
 PUBLIC_PROTO_HEADER = ldap_proto.h
 PUBLIC_HEADERS = ldap.h
@@ -12,6 +10,4 @@ OBJ_FILES = ldap.o \
                ldap_controls.o
 PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS LIBPACKET
 PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba-socket LIBCLI_RESOLVE NDR_SAMR LIBTLS ASN1_UTIL GENSEC_SOCKET
-#PRIVATE_DEPENDENCIES = gensec
-# End SUBSYSTEM LIBCLI_LDAP
-#################################
+#FIXME: PRIVATE_DEPENDENCIES = gensec

diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index b1aada7b3137f483a3d2aa6e39fa3ed0cc4477f8..ae8d5d9b4ab088ccc14f2f2fe77a23005774474a 100644 (file)
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -90,7 +90,6 @@ OBJ_FILES = \
                ntvfs_generic.o \
                ntvfs_interface.o \
                ntvfs_util.o
-PRIVATE_DEPENDENCIES = auth
 #
 # End SUBSYSTEM NTVFS
 ################################################