From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 24 May 2017 03:56:32 +0000 (+0200)
Subject: s3:secrets: use secrets_delete for all keys in secrets_delete_machine_password_ex()
X-Git-Tag: samba-4.5.13~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9afd00e79f4cd282f489a54e84bed0a7f748e332;p=thirdparty%2Fsamba.git

s3:secrets: use secrets_delete for all keys in secrets_delete_machine_password_ex()

We just want all values to be removed at the end, it doesn't matter
if they didn't existed before.

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>
(cherry picked from commit bfe35abc1fb15e70a99fa74d064051a1ad541ed0)
---

diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index 70a8277bd57..9a96a3f38fb 100644
--- a/source3/passdb/machine_account_secrets.c
+++ b/source3/passdb/machine_account_secrets.c
@@ -400,25 +400,25 @@ bool secrets_delete_machine_password_ex(const char *domain, const char *realm)
 	}
 
 	tmpkey = machine_password_keystr(domain);
-	ok = secrets_delete_entry(tmpkey);
+	ok = secrets_delete(tmpkey);
 	if (!ok) {
 		return false;
 	}
 
 	tmpkey = machine_sec_channel_type_keystr(domain);
-	ok = secrets_delete_entry(tmpkey);
+	ok = secrets_delete(tmpkey);
 	if (!ok) {
 		return false;
 	}
 
 	tmpkey = machine_last_change_time_keystr(domain);
-	ok = secrets_delete_entry(tmpkey);
+	ok = secrets_delete(tmpkey);
 	if (!ok) {
 		return false;
 	}
 
 	tmpkey = domain_sid_keystr(domain);
-	ok = secrets_delete_entry(tmpkey);
+	ok = secrets_delete(tmpkey);
 	if (!ok) {
 		return false;
 	}