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

diff --git a/source4/auth/credentials/credentials_krb5.c b/source4/auth/credentials/credentials_krb5.c
index 6e11a5fb02b7d0e729e2a8e317b1f361ed2c7dbf..c678b80f8741fff88bf7b88b1ddd2f24269648b1 100644 (file)
--- 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 fad29c8f6935a6fb8c36d64b6ab8413343777660..a8ef95fc1497dd8c9e461c2ca6efbe10bf8f197f 100644 (file)
--- 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 27cbeb06a24dbc76e6d36f17f0fd8a26d1fe9e73..3020e978bd2b6e3990459c6198f7036f6a5d0759 100644 (file)
--- 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 0c1828a55b2ebea3a665642e1aa920aec85bcb82..f5f615c004edc0ecc95aa9bccc47f2de5a6bcb22 100644 (file)
--- 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',
+       )
+