summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-11 01:28:45 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-10-11 00:34:56 +0000
commitc5ae0991528dfeb3dbd1539f5c9c2ed2f19990b9 (patch)
treec2190e22568fbf50843407d4c28864f84d51485e
parent539d5f518da96d348529f6a87064c040a63ba298 (diff)
downloadsamba-c5ae0991528dfeb3dbd1539f5c9c2ed2f19990b9.tar.gz
samba-c5ae0991528dfeb3dbd1539f5c9c2ed2f19990b9.tar.bz2
samba-c5ae0991528dfeb3dbd1539f5c9c2ed2f19990b9.zip
kerberos_util: Put into separate subsystem.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Mon Oct 11 00:34:56 UTC 2010 on sn-devel-104
-rw-r--r--source4/auth/credentials/credentials_krb5.c1
-rw-r--r--source4/auth/credentials/wscript_build4
-rw-r--r--source4/auth/kerberos/kerberos_util.c3
-rw-r--r--source4/auth/kerberos/wscript_build6
4 files changed, 11 insertions, 3 deletions
diff --git a/source4/auth/credentials/credentials_krb5.c b/source4/auth/credentials/credentials_krb5.c
index 6e11a5fb02..c678b80f87 100644
--- a/source4/auth/credentials/credentials_krb5.c
+++ b/source4/auth/credentials/credentials_krb5.c
@@ -28,6 +28,7 @@
#include "auth/credentials/credentials_proto.h"
#include "auth/credentials/credentials_krb5.h"
#include "auth/kerberos/kerberos_credentials.h"
+#include "auth/kerberos/kerberos_util.h"
#include "param/param.h"
_PUBLIC_ int cli_credentials_get_krb5_context(struct cli_credentials *cred,
diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build
index fad29c8f69..a8ef95fc14 100644
--- a/source4/auth/credentials/wscript_build
+++ b/source4/auth/credentials/wscript_build
@@ -1,9 +1,9 @@
#!/usr/bin/env python
bld.SAMBA_SUBSYSTEM('CREDENTIALS',
- source='credentials.c credentials_files.c credentials_ntlm.c credentials_krb5.c ../kerberos/kerberos_util.c',
+ source='credentials.c credentials_files.c credentials_ntlm.c credentials_krb5.c',
autoproto='credentials_proto.h',
- public_deps='LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS UTIL_LDB gssapi com_err',
+ public_deps='LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS KERBEROS_UTIL UTIL_LDB gssapi com_err',
public_headers='credentials.h',
deps='SECRETS SAMDB'
)
diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c
index 27cbeb06a2..3020e978bd 100644
--- a/source4/auth/kerberos/kerberos_util.c
+++ b/source4/auth/kerberos/kerberos_util.c
@@ -27,7 +27,8 @@
#include "auth/credentials/credentials_proto.h"
#include "auth/credentials/credentials_krb5.h"
#include "auth/kerberos/kerberos_credentials.h"
-#include "ldb.h"
+#include "auth/kerberos/kerberos_util.h"
+#include <ldb.h>
#include "param/secrets.h"
struct principal_container {
diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build
index 0c1828a55b..f5f615c004 100644
--- a/source4/auth/kerberos/wscript_build
+++ b/source4/auth/kerberos/wscript_build
@@ -7,3 +7,9 @@ bld.SAMBA_SUBSYSTEM('KERBEROS',
deps='ASN1_UTIL auth_sam_reply tevent LIBPACKET LIBNDR'
)
+bld.SAMBA_SUBSYSTEM('KERBEROS_UTIL',
+ autoproto='kerberos_util.h',
+ source='kerberos_util.c',
+ deps='KERBEROS com_err ldb SECRETS',
+ )
+