From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 22 May 2013 03:48:35 +0000 (+1000)
Subject: passdb-machine_account_secrets: Remove #if SAMBA_BUILD_ == 4 now we only have the... 
X-Git-Url: http://git.samba.org/?p=obnox%2Fsamba%2Fsamba-obnox.git;a=commitdiff_plain;h=f073401abf9a0f91715854d885fad96332d001b5

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

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 6320f4e2f7c..5758efe819c 100644
--- 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 a699aab870c..9a1cc1836cb 100644
--- 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;
 }