summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-11-07 00:48:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:25:00 -0500
commit13dbee3ffea6065a826f010e50c9b4eb2c6ad109 (patch)
treeeede29a3bff4c6de3432c16f5555dc9640267327 /source4/libcli
parentc755bb5025ee60ae41de9cc32d3fa54e3671941d (diff)
downloadsamba-13dbee3ffea6065a826f010e50c9b4eb2c6ad109.tar.gz
samba-13dbee3ffea6065a826f010e50c9b4eb2c6ad109.tar.bz2
samba-13dbee3ffea6065a826f010e50c9b4eb2c6ad109.zip
r19598: Ahead of a merge to current lorikeet-heimdal:
Break up auth/auth.h not to include the world. Add credentials_krb5.h with the kerberos dependent prototypes. Andrew Bartlett (This used to be commit 2b569c42e0fbb596ea82484d0e1cb22e193037b9)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/auth/libcli_auth.h2
-rw-r--r--source4/libcli/config.mk2
-rw-r--r--source4/libcli/ldap/ldap_bind.c2
-rw-r--r--source4/libcli/smb_composite/sesssetup.c2
4 files changed, 5 insertions, 3 deletions
diff --git a/source4/libcli/auth/libcli_auth.h b/source4/libcli/auth/libcli_auth.h
index f8f07e8337..e6e00568ff 100644
--- a/source4/libcli/auth/libcli_auth.h
+++ b/source4/libcli/auth/libcli_auth.h
@@ -19,7 +19,7 @@
#define __LIBCLI_AUTH_H__
#include "librpc/gen_ndr/netlogon.h"
-#include "auth/credentials/credentials.h"
+#include "libcli/auth/credentials.h"
#include "libcli/auth/proto.h"
#endif /* __LIBCLI_AUTH_H__ */
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 46f3336fd1..a64f41dbf4 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -36,7 +36,7 @@ OBJ_FILES = \
smb_composite/fetchfile.o \
smb_composite/appendacl.o \
smb_composite/fsinfo.o
-PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE
+PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE CREDENTIALS
[SUBSYSTEM::NDR_NBT_BUF]
PRIVATE_PROTO_HEADER = nbt/nbtname.h
diff --git a/source4/libcli/ldap/ldap_bind.c b/source4/libcli/ldap/ldap_bind.c
index f617cbe102..c4c731e4f5 100644
--- a/source4/libcli/ldap/ldap_bind.c
+++ b/source4/libcli/ldap/ldap_bind.c
@@ -26,7 +26,7 @@
#include "libcli/ldap/ldap.h"
#include "libcli/ldap/ldap_client.h"
#include "lib/tls/tls.h"
-#include "auth/auth.h"
+#include "auth/gensec/gensec.h"
#include "auth/gensec/socket.h"
#include "lib/stream/packet.h"
diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c
index d264f588da..8528ac2ef7 100644
--- a/source4/libcli/smb_composite/sesssetup.c
+++ b/source4/libcli/smb_composite/sesssetup.c
@@ -27,6 +27,8 @@
#include "libcli/smb_composite/smb_composite.h"
#include "libcli/auth/libcli_auth.h"
#include "auth/auth.h"
+#include "auth/gensec/gensec.h"
+#include "auth/credentials/credentials.h"
#include "version.h"
struct sesssetup_state {