sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

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

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Simo Sorce 2012-04-01 19:08:15 -04:00 committed by Andreas Schneider
parent c13c065a9b
commit a925c2c48d
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
auth/credentials/credentials_krb5.c
View File

@ -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),

25
source4/auth/kerberos/srv_keytab.c
View File

@ -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,11 +519,9 @@ 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,
*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,

2
source4/dsdb/samdb/ldb_modules/update_keytab.c
View File

@ -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,