From 7d2eea39112fd69d2b710181b23301562efea387 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 18 May 2017 16:02:44 +0200 Subject: s3:libnet_join: move kerberos_secrets_store_des_salt() to libnet_join_joindomain_store_secrets() BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782 Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider --- source3/libnet/libnet_join.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 56bddf56fe1..7669c2e0a4d 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -970,17 +970,6 @@ static ADS_STATUS libnet_join_post_processing_ads_modify(TALLOC_CTX *mem_ctx, static ADS_STATUS libnet_join_post_processing_ads_sync(TALLOC_CTX *mem_ctx, struct libnet_JoinCtx *r) { - 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"); @@ -1013,6 +1002,16 @@ static bool libnet_join_joindomain_store_secrets(TALLOC_CTX *mem_ctx, return false; } + if (r->out.krb5_salt != NULL) { + bool ok; + + ok = kerberos_secrets_store_des_salt(r->out.krb5_salt); + if (!ok) { + DEBUG(1,("Failed to save krb5 salt\n")); + return false; + } + } + return true; } -- cgit v1.2.1