r26504: Don't rely on system-provided kerberos headers.

(This used to be commit c4b1df047663519300370508761c70b0c096b7f2)

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 8b1f1fcf85cbce673da65ceec95e32b8d4c5a952..3514059cf00c42a9910e9fc1c24262cc0ab3c8e4 100644 (file)
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -7,11 +7,13 @@ include credentials/config.mk
 [SUBSYSTEM::auth_session]
 OBJ_FILES = session.o
 PUBLIC_PROTO_HEADER = session_proto.h
+PUBLIC_DEPENDENCIES = CREDENTIALS
 
 [SUBSYSTEM::auth_system_session]
 OBJ_FILES = system_session.o
 PUBLIC_PROTO_HEADER = system_session_proto.h
-PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL LIBSECURITY CREDENTIALS
+PUBLIC_DEPENDENCIES = CREDENTIALS
+PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL LIBSECURITY 
 
 [SUBSYSTEM::auth_sam]
 PRIVATE_PROTO_HEADER = auth_sam.h

diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index 902a9c42b7fa117adb42d11c8a6cfdf93876a5db..4c8308d01f4ae5dc4796adf4f61f66c47fca22ad 100644 (file)
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -9,9 +9,9 @@ OBJ_FILES = credentials.o \
                credentials_krb5.o \
                ../kerberos/kerberos_util.o
 PUBLIC_DEPENDENCIES = \
-               LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS UTIL_LDB
+               LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS UTIL_LDB HEIMDAL_GSSAPI 
 PRIVATE_DEPENDENCIES = \
-               HEIMDAL_GSSAPI KERBEROS SECRETS
+               SECRETS
 
 [PYTHON::swig_credentials]
 PUBLIC_DEPENDENCIES = CREDENTIALS LIBPYTHON

diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
index cb51dc9fa1144b1bcbad7734c10525e544bcc1b7..544850264a8f12342d73b86ac2e1f76bb2a2d3c2 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 = MSRPC_PARSE
+PRIVATE_DEPENDENCIES = MSRPC_PARSE CREDENTIALS
 OUTPUT_TYPE = INTEGRATED
 # End MODULE gensec_ntlmssp
 ################################################

diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index 52a377dbba2d78c0596084f1cd1f1e7f2bdbc866..c7873435150f5950fe8351a85ebe23d7b00c9a98 100644 (file)
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -22,7 +22,7 @@ OBJ_FILES = \
                hdb-ldb.o \
                pac-glue.o 
 PRIVATE_DEPENDENCIES = \
-               LIBLDB auth_sam auth_sam_reply KERBEROS
+               LIBLDB auth_sam auth_sam_reply KERBEROS CREDENTIALS
 # End SUBSYSTEM KDC
 #######################
 

diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk
index 48f8f476658619345c1a9c71a854099af9c39d0f..76f1ce50967eda142cf5c2d9942369fe1e0d3c5d 100644 (file)
--- a/source4/lib/samba3/config.mk
+++ b/source4/lib/samba3/config.mk
@@ -10,7 +10,8 @@ OBJ_FILES = tdbsam.o policy.o \
                idmap.o winsdb.o samba3.o group.o \
                registry.o secrets.o share_info.o
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBTDB NDR_SECURITY \
-                                          CREDENTIALS SMBPASSWD LIBSECURITY 
+                                          SMBPASSWD LIBSECURITY 
+PUBLIC_DEPENDENCIES = CREDENTIALS 
 # End SUBSYSTEM LIBSAMBA3
 ################################################
 

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 50b3647a0d1c1672bbcd6fd520bde8b6b7f8d725..adb51c6c9aeea933c14822792bfde67d769d0c0d 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -136,9 +136,9 @@ PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
 
 [SUBSYSTEM::LIBCLI_RAW]
 PRIVATE_PROTO_HEADER = raw/raw_proto.h
-PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE LP_RESOLVE CREDENTIALS gensec LIBCLI_RESOLVE LIBSECURITY LIBNDR
+PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE LIBSECURITY LIBNDR
 LDFLAGS = $(SUBSYSTEM_LIBCLI_SMB_COMPOSITE_OUTPUT)
-PUBLIC_DEPENDENCIES = samba-socket LIBPACKET gensec LIBCRYPTO
+PUBLIC_DEPENDENCIES = samba-socket LIBPACKET gensec LIBCRYPTO CREDENTIALS 
 OBJ_FILES = raw/rawfile.o \
                raw/smb_signing.o \
                raw/clisocket.o \

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index ff430047804ed760245d91b8a9e5724e9e26e5d4..2b2f39b650a0d3eedafb889b66f8c3b06d59feb8 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -487,8 +487,9 @@ PRIVATE_DEPENDENCIES = \
                samba-socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
                LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER \
                NDR_SCHANNEL RPC_NDR_NETLOGON \
-               gensec LIBCLI_AUTH LIBCLI_RAW CREDENTIALS \
+               gensec LIBCLI_AUTH LIBCLI_RAW \
                LP_RESOLVE
+PUBLIC_DEPENDENCIES = CREDENTIALS 
 # End SUBSYSTEM dcerpc
 ################################################
 

diff --git a/source4/smb_server/smb/config.mk b/source4/smb_server/smb/config.mk
index 05ff69316dd20982f6c7c1883610e0b5effa7ef9..22151ebd3b04c485f49b2f16b5fb2c535bef5867 100644 (file)
--- a/source4/smb_server/smb/config.mk
+++ b/source4/smb_server/smb/config.mk
@@ -15,7 +15,7 @@ OBJ_FILES = \
                trans2.o \
                signing.o
 PUBLIC_DEPENDENCIES = \
-               ntvfs LIBPACKET
+               ntvfs LIBPACKET CREDENTIALS
 LDFLAGS = $(SUBSYSTEM_SMB_SERVER_OUTPUT)
 # End SUBSYSTEM SMB_PROTOCOL
 #######################