passdb-machine_account_secrets: Remove #if SAMBA_BUILD_ == 4 now we only have the...

Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>

diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index 6320f4e2f7cc635b95bc19d3a90787404598b63b..5758efe819c548e52ddc6d6d5817d905b8ce07d0 100644 (file)
--- a/source3/passdb/machine_account_secrets.c
+++ b/source3/passdb/machine_account_secrets.c
@@ -90,12 +90,9 @@ bool secrets_clear_domain_protection(const char *domain)
 
 bool secrets_store_domain_sid(const char *domain, const struct dom_sid  *sid)
 {
-#if _SAMBA_BUILD_ == 4
        char *protect_ids;
-#endif
        bool ret;
 
-#if _SAMBA_BUILD_ == 4
        protect_ids = secrets_fetch(protect_ids_keystr(domain), NULL);
        if (protect_ids) {
                if (strncmp(protect_ids, "TRUE", 4)) {
@@ -106,7 +103,6 @@ bool secrets_store_domain_sid(const char *domain, const struct dom_sid  *sid)
                }
        }
        SAFE_FREE(protect_ids);
-#endif
 
        ret = secrets_store(domain_sid_keystr(domain), sid, sizeof(struct dom_sid ));
 
@@ -138,12 +134,9 @@ bool secrets_fetch_domain_sid(const char *domain, struct dom_sid  *sid)
 
 bool secrets_store_domain_guid(const char *domain, struct GUID *guid)
 {
-#if _SAMBA_BUILD_ == 4
        char *protect_ids;
-#endif
        fstring key;
 
-#if _SAMBA_BUILD_ == 4
        protect_ids = secrets_fetch(protect_ids_keystr(domain), NULL);
        if (protect_ids) {
                if (strncmp(protect_ids, "TRUE", 4)) {
@@ -154,7 +147,6 @@ bool secrets_store_domain_guid(const char *domain, struct GUID *guid)
                }
        }
        SAFE_FREE(protect_ids);
-#endif
 
        slprintf(key, sizeof(key)-1, "%s/%s", SECRETS_DOMAIN_GUID, domain);
        if (!strupper_m(key)) {

diff --git a/source3/passdb/pdb_ipa.c b/source3/passdb/pdb_ipa.c
index a699aab870c22fe65dc0cb28e6fab208c372c191..9a1cc1836cbf6d257061529311c173950c31049a 100644 (file)
--- a/source3/passdb/pdb_ipa.c
+++ b/source3/passdb/pdb_ipa.c
@@ -1407,7 +1407,6 @@ static NTSTATUS ipasam_create_user(struct pdb_methods *pdb_methods,
 
 static NTSTATUS pdb_ipa_init_secrets(struct pdb_methods *m)
 {
-#if _SAMBA_BUILD_ == 4
        struct pdb_domain_info *dom_info;
        bool ret;
 
@@ -1437,7 +1436,6 @@ done:
        if (!ret) {
                return NT_STATUS_UNSUCCESSFUL;
        }
-#endif
        return NT_STATUS_OK;
 }