sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-11 09:44:19 +03:00
Code Activity

r13104: Migrate and set secrets keytab values in the 'net join' code. This

Browse Source 
avoids falling back to in-memory keytabs.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2006-01-24 02:25:50 +00:00
committed by Gerald (Jerry) Carter
parent cde044d023
commit 59fbce01c6
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/libnet/libnet_join.c
View File

@@ -844,6 +844,8 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
"secret", "secret",
"priorSecret", "priorSecret",
"priorChanged", "priorChanged",
"krb5Keytab",
"privateKeytab",
NULL NULL
}; };
uint32_t acct_type = 0; uint32_t acct_type = 0;
@@ -1036,6 +1038,12 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
"(|" SECRETS_PRIMARY_DOMAIN_FILTER "(realm=%s))", "(|" SECRETS_PRIMARY_DOMAIN_FILTER "(realm=%s))",
r2->out.domain_name, r2->out.realm); r2->out.domain_name, r2->out.realm);
if (ret == 0) { if (ret == 0) {
rtn = samdb_msg_set_string(ldb, tmp_mem, msg, "secretsKeytab", "secrets.keytab");
if (rtn == -1) {
r->out.error_string = NULL;
talloc_free(tmp_mem);
return NT_STATUS_NO_MEMORY;
}
} else if (ret == -1) { } else if (ret == -1) {
r->out.error_string r->out.error_string
= talloc_asprintf(mem_ctx, = talloc_asprintf(mem_ctx,
@@ -1044,6 +1052,8 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
talloc_free(tmp_mem); talloc_free(tmp_mem);
return NT_STATUS_INTERNAL_DB_CORRUPTION; return NT_STATUS_INTERNAL_DB_CORRUPTION;
} else { } else {
const struct ldb_val *private_keytab;
const struct ldb_val *krb5_keytab;
const struct ldb_val *prior_secret; const struct ldb_val *prior_secret;
const struct ldb_val *prior_modified_time; const struct ldb_val *prior_modified_time;
int i; int i;
@@ -1093,6 +1103,26 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
talloc_free(tmp_mem); talloc_free(tmp_mem);
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
/* We will want to keep the keytab names */
private_keytab = ldb_msg_find_ldb_val(msgs[0], "privateKeytab");
if (private_keytab) {
rtn = samdb_msg_set_value(ldb, tmp_mem, msg, "privateKeytab", private_keytab);
if (rtn == -1) {
r->out.error_string = NULL;
talloc_free(tmp_mem);
return NT_STATUS_NO_MEMORY;
}
}
krb5_keytab = ldb_msg_find_ldb_val(msgs[0], "krb5Keytab");
if (krb5_keytab) {
rtn = samdb_msg_set_value(ldb, tmp_mem, msg, "krb5Keytab", krb5_keytab);
if (rtn == -1) {
r->out.error_string = NULL;
talloc_free(tmp_mem);
return NT_STATUS_NO_MEMORY;
}
}
} }
/* create the secret */ /* create the secret */