winbindd: Fix indentation

[sfrench/samba-autobuild/.git] / source3 / passdb / secrets.c

diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 0ddee99a71fb2402bb978badfcf6a48c1fcd965c..7533d6b842f2189cf1fd7b6936140ec45cc1f9bb 100644 (file)
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -146,7 +146,7 @@ bool secrets_store(const char *key, const void *data, size_t size)
 
 /* delete a secets database entry
  */
-bool secrets_delete(const char *key)
+bool secrets_delete_entry(const char *key)
 {
        NTSTATUS status;
        if (!secrets_init()) {
@@ -158,6 +158,25 @@ bool secrets_delete(const char *key)
        return NT_STATUS_IS_OK(status);
 }
 
+/*
+ * Deletes the key if it exists.
+ */
+bool secrets_delete(const char *key)
+{
+       bool exists;
+
+       if (!secrets_init()) {
+               return false;
+       }
+
+       exists = dbwrap_exists(db_ctx, string_tdb_data(key));
+       if (!exists) {
+               return true;
+       }
+
+       return secrets_delete_entry(key);
+}
+
 /**
  * Form a key for fetching a trusted domain password
  *
@@ -277,7 +296,7 @@ bool secrets_store_trusted_domain_password(const char* domain, const char* pwd,
 
 bool trusted_domain_password_delete(const char *domain)
 {
-       return secrets_delete(trustdom_keystr(domain));
+       return secrets_delete_entry(trustdom_keystr(domain));
 }
 
 bool secrets_store_ldap_pw(const char* dn, char* pw)
@@ -359,7 +378,7 @@ bool fetch_ldap_pw(char **dn, char** pw)
                        SAFE_FREE(*dn);
                        return False;
                }
-               if (!secrets_delete(old_style_key)) {
+               if (!secrets_delete_entry(old_style_key)) {
                        DEBUG(0,("fetch_ldap_pw: old ldap secret could not be deleted!\n"));
                }