summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-17 11:12:42 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:51:07 +0100
commitc2604542295d5665172019da829544202ff034d6 (patch)
tree9eecbeac8d10f0fd3564916297a1aecbd3d1b276 /source4
parent32f439bfa458f7936b507cb5a1e3c74bcb8c68bf (diff)
downloadsamba-c2604542295d5665172019da829544202ff034d6.tar.gz
samba-c2604542295d5665172019da829544202ff034d6.tar.bz2
samba-c2604542295d5665172019da829544202ff034d6.zip
r26504: Don't rely on system-provided kerberos headers.
(This used to be commit c4b1df047663519300370508761c70b0c096b7f2)
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/config.mk4
-rw-r--r--source4/auth/credentials/config.mk4
-rw-r--r--source4/auth/ntlmssp/config.mk2
-rw-r--r--source4/kdc/config.mk2
-rw-r--r--source4/lib/samba3/config.mk3
-rw-r--r--source4/libcli/config.mk4
-rw-r--r--source4/librpc/config.mk3
-rw-r--r--source4/smb_server/smb/config.mk2
8 files changed, 14 insertions, 10 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 8b1f1fcf85..3514059cf0 100644
--- 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 902a9c42b7..4c8308d01f 100644
--- 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 cb51dc9fa1..544850264a 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 = 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 52a377dbba..c787343515 100644
--- 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 48f8f47665..76f1ce5096 100644
--- 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 50b3647a0d..adb51c6c9a 100644
--- 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 ff43004780..2b2f39b650 100644
--- 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 05ff69316d..22151ebd3b 100644
--- 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
#######################