sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

s3:libnet_join: move kerberos_secrets_store_des_salt() out of libnet_join_derive_salting_principal()

Browse Source 
We should separate the calculation and the storing steps.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Stefan Metzmacher 2017-05-18 15:48:49 +02:00
parent 549c9d9a07
commit 0c65d5f410
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source3/libnet/libnet_join.c
View File

@ -865,7 +865,7 @@ static bool libnet_join_derive_salting_principal(TALLOC_CTX *mem_ctx,
}
r->out.krb5_salt = salt;
return kerberos_secrets_store_des_salt(salt);
return true;
}
/****************************************************************
@ -964,6 +964,17 @@ static ADS_STATUS libnet_join_post_processing_ads(TALLOC_CTX *mem_ctx,
return ADS_ERROR_NT(NT_STATUS_UNSUCCESSFUL);
}
if (r->out.krb5_salt != NULL) {
bool ok;
ok = kerberos_secrets_store_des_salt(r->out.krb5_salt);
if (!ok) {
libnet_join_set_error_string(mem_ctx, r,
"failed to store krb5_salt");
return ADS_ERROR_NT(NT_STATUS_UNSUCCESSFUL);
}
}
if (!libnet_join_create_keytab(mem_ctx, r)) {
libnet_join_set_error_string(mem_ctx, r,
"failed to create kerberos keytab");