Signed-off-by: Andreas Schneider <asn@samba.org>
- 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),
cli_credentials_get_password(cred),
cli_credentials_get_username(cred),
cli_credentials_get_realm(cred),
}
krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
}
krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
- struct smb_krb5_context *smb_krb5_context,
const char *keytab_name,
const char *samAccountName,
const char *realm,
const char *keytab_name,
const char *samAccountName,
const char *realm,
- ret = krb5_kt_resolve(smb_krb5_context->krb5_context,
- keytab_name, &keytab);
+ ret = krb5_kt_resolve(context, keytab_name, &keytab);
- *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);
/* Get the principal we will store the new keytab entries under */
ret = principals_from_list(tmp_ctx,
samAccountName, realm, SPNs, num_SPNs,
/* 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,
if (ret != 0) {
*error_string = talloc_asprintf(parent_ctx,
}
ret = remove_old_entries(tmp_ctx, kvno, principals, delete_all_kvno,
}
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",
if (ret != 0) {
*error_string = talloc_asprintf(parent_ctx,
"Failed to remove old principals from keytab: %s\n",
samAccountName, realm, saltPrincipal,
kvno, new_secret, old_secret,
supp_enctypes, principals,
samAccountName, realm, saltPrincipal,
kvno, new_secret, old_secret,
supp_enctypes, principals,
- smb_krb5_context->krb5_context,
- keytab,
found_previous ? false : true,
error_string);
if (ret) {
found_previous ? false : true,
error_string);
if (ret) {
- keytab_principals_free(smb_krb5_context->krb5_context, principals);
+ keytab_principals_free(context, principals);
if (ret != 0 || _keytab == NULL) {
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,
}
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,
const char *new_secret,
const char *samAccountName,
const char *realm,
const char *new_secret,
const char *samAccountName,
const char *realm,
- 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,
*keytab_name, samAccountName, realm,
NULL, 0, NULL, new_secret, NULL,
kvno, ENC_ALL_TYPES,
- 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,
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,