sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

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

Browse Source 
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>

Reviewed-by: David Disseldorp <ddiss@samba.org>
This commit is contained in:
Andrew Bartlett 2013-05-22 13:48:35 +10:00
parent 2c70b0edcf
commit f073401abf
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/passdb/machine_account_secrets.c
View File

@ -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)) {

2
source3/passdb/pdb_ipa.c
View File

@ -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;
}