sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3:secrets: rewrite secrets_delete_machine_password_ex() using helper variables

Browse Source 
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-22 12:31:01 +02:00
parent 5b95cb74e7
commit 5bc2764fe5
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source3/passdb/machine_account_secrets.c
View File

@ -377,16 +377,34 @@ bool secrets_fetch_trust_account_password(const char *domain, uint8_t ret_pwd[16
bool secrets_delete_machine_password_ex(const char *domain) bool secrets_delete_machine_password_ex(const char *domain)
{ {
if (!secrets_delete(machine_prev_password_keystr(domain))) { const char *tmpkey = NULL;
bool ok;
tmpkey = machine_prev_password_keystr(domain);
ok = secrets_delete(tmpkey);
if (!ok) {
return false; return false;
} }
if (!secrets_delete_entry(machine_password_keystr(domain))) {
tmpkey = machine_password_keystr(domain);
ok = secrets_delete_entry(tmpkey);
if (!ok) {
return false; return false;
} }
if (!secrets_delete_entry(machine_sec_channel_type_keystr(domain))) {
tmpkey = machine_sec_channel_type_keystr(domain);
ok = secrets_delete_entry(tmpkey);
if (!ok) {
return false; return false;
} }
return secrets_delete_entry(machine_last_change_time_keystr(domain));
tmpkey = machine_last_change_time_keystr(domain);
ok = secrets_delete_entry(tmpkey);
if (!ok) {
return false;
}
return true;
} }
/************************************************************************ /************************************************************************