srv_keytab: Pass krb5_context directly, it's all we use anyways.

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

diff --git a/auth/credentials/credentials_krb5.c b/auth/credentials/credentials_krb5.c
index 74dbb0a5d8c8f44c6b59e5c1248562e9fd585217..c8b685ea794ac8a16d72fbbd65905e03ff10fdda 100644 (file)
--- a/auth/credentials/credentials_krb5.c
+++ b/auth/credentials/credentials_krb5.c
@@ -690,7 +690,8 @@ _PUBLIC_ int cli_credentials_get_keytab(struct cli_credentials *cred,
                return ENOMEM;
        }
 
-       ret = smb_krb5_create_memory_keytab(mem_ctx, smb_krb5_context,
+       ret = smb_krb5_create_memory_keytab(mem_ctx,
+                                       smb_krb5_context->krb5_context,
                                        cli_credentials_get_password(cred),
                                        cli_credentials_get_username(cred),
                                        cli_credentials_get_realm(cred),

diff --git a/source4/auth/kerberos/srv_keytab.c b/source4/auth/kerberos/srv_keytab.c
index cdf384e8b3e62a494b44172f82731f4c1cec3e44..ca2d3853da200f33e16b7e5952bbfcbb1376e337 100644 (file)
--- a/source4/auth/kerberos/srv_keytab.c
+++ b/source4/auth/kerberos/srv_keytab.c
@@ -494,7 +494,7 @@ static krb5_error_code remove_old_entries(TALLOC_CTX *parent_ctx,
 }
 
 krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
-                               struct smb_krb5_context *smb_krb5_context,
+                               krb5_context context,
                                const char *keytab_name,
                                const char *samAccountName,
                                const char *realm,
@@ -519,12 +519,10 @@ krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
                return ENOENT;
        }
 
-       ret = krb5_kt_resolve(smb_krb5_context->krb5_context,
-                                       keytab_name, &keytab);
+       ret = krb5_kt_resolve(context, keytab_name, &keytab);
        if (ret) {
-               *error_string = smb_get_krb5_error_message(
-                                       smb_krb5_context->krb5_context,
-                                       ret, parent_ctx);
+               *error_string = smb_get_krb5_error_message(context,
+                                                          ret, parent_ctx);
                return ret;
        }
 
@@ -538,8 +536,7 @@ krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
        /* Get the principal we will store the new keytab entries under */
        ret = principals_from_list(tmp_ctx,
                                  samAccountName, realm, SPNs, num_SPNs,
-                                 smb_krb5_context->krb5_context,
-                                 &principals, error_string);
+                                 context, &principals, error_string);
 
        if (ret != 0) {
                *error_string = talloc_asprintf(parent_ctx,
@@ -549,8 +546,7 @@ krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
        }
 
        ret = remove_old_entries(tmp_ctx, kvno, principals, delete_all_kvno,
-                                smb_krb5_context->krb5_context,
-                                keytab, &found_previous, error_string);
+                                context, keytab, &found_previous, error_string);
        if (ret != 0) {
                *error_string = talloc_asprintf(parent_ctx,
                        "Failed to remove old principals from keytab: %s\n",
@@ -567,8 +563,7 @@ krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
                                    samAccountName, realm, saltPrincipal,
                                    kvno, new_secret, old_secret,
                                    supp_enctypes, principals,
-                                   smb_krb5_context->krb5_context,
-                                   keytab,
+                                   context, keytab,
                                    found_previous ? false : true,
                                    error_string);
                if (ret) {
@@ -582,16 +577,16 @@ krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
        }
 
 done:
-       keytab_principals_free(smb_krb5_context->krb5_context, principals);
+       keytab_principals_free(context, principals);
        if (ret != 0 || _keytab == NULL) {
-               krb5_kt_close(smb_krb5_context->krb5_context, keytab);
+               krb5_kt_close(context, keytab);
        }
        talloc_free(tmp_ctx);
        return ret;
 }
 
 krb5_error_code smb_krb5_create_memory_keytab(TALLOC_CTX *parent_ctx,
-                               struct smb_krb5_context *smb_krb5_context,
+                               krb5_context context,
                                const char *new_secret,
                                const char *samAccountName,
                                const char *realm,
@@ -620,7 +615,7 @@ krb5_error_code smb_krb5_create_memory_keytab(TALLOC_CTX *parent_ctx,
        }
 
 
-       ret = smb_krb5_update_keytab(mem_ctx, smb_krb5_context,
+       ret = smb_krb5_update_keytab(mem_ctx, context,
                                     *keytab_name, samAccountName, realm,
                                     NULL, 0, NULL, new_secret, NULL,
                                     kvno, ENC_ALL_TYPES,

diff --git a/source4/dsdb/samdb/ldb_modules/update_keytab.c b/source4/dsdb/samdb/ldb_modules/update_keytab.c
index f1ec9953fb821a1b280c8f3befc56e86415662b0..f07d9b2aadf280bce36d37632798d2daa65153bf 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/update_keytab.c
+++ b/source4/dsdb/samdb/ldb_modules/update_keytab.c
@@ -431,7 +431,7 @@ static int update_kt_prepare_commit(struct ldb_module *module)
                        }
                }
 
-               krb5_ret = smb_krb5_update_keytab(tmp_ctx, smb_krb5_context,
+               krb5_ret = smb_krb5_update_keytab(tmp_ctx, smb_krb5_context->krb5_context,
                                                  keytab_name_from_msg(tmp_ctx, ldb, p->msg),
                                                  ldb_msg_find_attr_as_string(p->msg, "samAccountName", NULL),
                                                  realm, (const char **)SPNs, num_SPNs,