summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-05-22 13:48:35 +1000
committerAndrew Bartlett <abartlet@samba.org>2013-05-28 12:17:12 +1000
commitf073401abf9a0f91715854d885fad96332d001b5 (patch)
tree54eb2a5957695df34622bbcf2fe8b0b3340bb9d6
parent2c70b0edcfbc009b5cdc27454d3703fbf20a50bd (diff)
downloadsamba-f073401abf9a0f91715854d885fad96332d001b5.tar.gz
samba-f073401abf9a0f91715854d885fad96332d001b5.tar.bz2
samba-f073401abf9a0f91715854d885fad96332d001b5.zip
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>
-rw-r--r--source3/passdb/machine_account_secrets.c8
-rw-r--r--source3/passdb/pdb_ipa.c2
2 files changed, 0 insertions, 10 deletions
diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index 6320f4e2f7..5758efe819 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 a699aab870..9a1cc1836c 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;
}