1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-10 13:57:47 +03:00

s3:secrets: rewrite secrets_delete_machine_password_ex() using helper variables

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 5bc2764fe517748c03a57b61f2f7ef889c92825d)
This commit is contained in:
Stefan Metzmacher 2017-05-22 12:31:01 +02:00
parent bce615d2e3
commit fc8506dcf9

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)
{
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;
}
if (!secrets_delete_entry(machine_password_keystr(domain))) {
tmpkey = machine_password_keystr(domain);
ok = secrets_delete_entry(tmpkey);
if (!ok) {
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 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;
}
/************************************************************************