From fdbf0dee0a31c2659dc422e231495f4c4f835e06 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 22 May 2017 12:27:45 +0200 Subject: [PATCH] s3:secrets: let secrets_store_machine_pw_sync() delete the des_salt_key when there's no value BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782 Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider (cherry picked from commit 45eea321a6faa6db1c9c706a27527cc0766dc831) --- source3/passdb/machine_account_secrets.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c index 6b89e2527f9..c3a760b2965 100644 --- a/source3/passdb/machine_account_secrets.c +++ b/source3/passdb/machine_account_secrets.c @@ -537,9 +537,16 @@ bool secrets_store_machine_pw_sync(const char *pass, const char *oldpass, const return ret; } - if (realm && salting_principal) { + if (realm != NULL) { char *key = des_salt_key(realm); - ret = secrets_store(key, salting_principal, strlen(salting_principal)+1 ); + + if (salting_principal != NULL) { + ret = secrets_store(key, + salting_principal, + strlen(salting_principal)+1); + } else { + ret = secrets_delete(key); + } } TALLOC_FREE(frame); -- 2.47.2