s4-auth-krb: Remove dependency on credentials too.

Signed-off-by: Andreas Schneider <asn@samba.org>

diff --git a/auth/credentials/credentials_krb5.c b/auth/credentials/credentials_krb5.c
index 40ae454a9d11c5d827c1be261f780bb8cbb5e347..74dbb0a5d8c8f44c6b59e5c1248562e9fd585217 100644 (file)
--- a/auth/credentials/credentials_krb5.c
+++ b/auth/credentials/credentials_krb5.c
@@ -690,9 +690,12 @@ _PUBLIC_ int cli_credentials_get_keytab(struct cli_credentials *cred,
                return ENOMEM;
        }
 
-       ret = smb_krb5_create_memory_keytab(mem_ctx, cred,
-                                           smb_krb5_context,
-                                           &keytab, &keytab_name);
+       ret = smb_krb5_create_memory_keytab(mem_ctx, smb_krb5_context,
+                                       cli_credentials_get_password(cred),
+                                       cli_credentials_get_username(cred),
+                                       cli_credentials_get_realm(cred),
+                                       cli_credentials_get_kvno(cred),
+                                       &keytab, &keytab_name);
        if (ret) {
                talloc_free(mem_ctx);
                return ret;

diff --git a/source4/auth/kerberos/srv_keytab.c b/source4/auth/kerberos/srv_keytab.c
index 475f09d9342807de2300204ae706721efe381f2c..cdf384e8b3e62a494b44172f82731f4c1cec3e44 100644 (file)
--- a/source4/auth/kerberos/srv_keytab.c
+++ b/source4/auth/kerberos/srv_keytab.c
@@ -22,7 +22,6 @@
 
 
 #include "includes.h"
-#include "auth/credentials/credentials.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
 #include "auth/kerberos/kerberos_srv_keytab.h"
@@ -592,18 +591,17 @@ done:
 }
 
 krb5_error_code smb_krb5_create_memory_keytab(TALLOC_CTX *parent_ctx,
-                               struct cli_credentials *machine_account,
                                struct smb_krb5_context *smb_krb5_context,
+                               const char *new_secret,
+                               const char *samAccountName,
+                               const char *realm,
+                               int kvno,
                                krb5_keytab *keytab,
                                const char **keytab_name)
 {
        krb5_error_code ret;
        TALLOC_CTX *mem_ctx = talloc_new(parent_ctx);
        const char *rand_string;
-       const char *new_secret;
-       const char *samAccountName;
-       const char *realm;
-       int kvno;
        const char *error_string;
        if (!mem_ctx) {
                return ENOMEM;
@@ -621,10 +619,6 @@ krb5_error_code smb_krb5_create_memory_keytab(TALLOC_CTX *parent_ctx,
                return ENOMEM;
        }
 
-       new_secret = cli_credentials_get_password(machine_account);
-       samAccountName = cli_credentials_get_username(machine_account);
-       realm = cli_credentials_get_realm(machine_account);
-       kvno = cli_credentials_get_kvno(machine_account);
 
        ret = smb_krb5_update_keytab(mem_ctx, smb_krb5_context,
                                     *keytab_name, samAccountName, realm,

diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build
index 28269c54b433c1f16fdcee3748d0c87fef49a1b9..619626fe193eb6b009cff15540df774d97a8ba9f 100755 (executable)
--- a/source4/auth/kerberos/wscript_build
+++ b/source4/auth/kerberos/wscript_build
@@ -17,5 +17,5 @@ bld.SAMBA_SUBSYSTEM('KERBEROS_UTIL',
 bld.SAMBA_SUBSYSTEM('KERBEROS_SRV_KEYTAB',
        autoproto='kerberos_srv_keytab.h',
        source='srv_keytab.c',
-       deps='authkrb5 samba-credentials',
+       deps='authkrb5',
        )