summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-11-27 02:04:38 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:46:18 +0100
commit0ac6bffdf46003517127fbd9763f74e09e96c21a (patch)
tree40b0a1883a8864f4041fd6493e5acb6c5241cc53 /source4
parent25143a26481e735c46c61aa3673eb4858a7819be (diff)
downloadsamba-0ac6bffdf46003517127fbd9763f74e09e96c21a.tar.gz
samba-0ac6bffdf46003517127fbd9763f74e09e96c21a.tar.bz2
samba-0ac6bffdf46003517127fbd9763f74e09e96c21a.zip
r26136: Attempt to fix dependencies for auth.
(This used to be commit abf2600a044cdbab6c5d7880d18217bff3d15c39)
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/config.mk1
-rw-r--r--source4/auth/gensec/config.mk6
-rw-r--r--source4/auth/ntlmssp/config.mk2
-rw-r--r--source4/dsdb/config.mk3
-rw-r--r--source4/ldap_server/config.mk2
-rw-r--r--source4/libcli/config.mk2
-rw-r--r--source4/libcli/ldap/config.mk6
-rw-r--r--source4/ntvfs/config.mk1
8 files changed, 9 insertions, 14 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 2e9b2d86ce..58bc7ce9ba 100644
--- 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 b358011135..17954bbe50 100644
--- 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 9ef3ee9623..cb51dc9fa1 100644
--- 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 56a8f532b1..77a9085f0e 100644
--- 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 9aa7aae9f0..51650a116f 100644
--- 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 d7aaac0447..3bfc1478bc 100644
--- 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 e5a7133cfa..adccd23eb1 100644
--- 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 b1aada7b31..ae8d5d9b4a 100644
--- 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
################################################