summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-05-22 13:44:59 +1000
committerAndrew Bartlett <abartlet@samba.org>2013-05-28 12:17:11 +1000
commit2bede9d0d6f92046dffe9bcd282fdd791339b10c (patch)
tree088fb96c2a2bae5157dd686107ac93624fa40061
parentae144978bc7141e66426eccf08450a6408eda359 (diff)
downloadsamba-2bede9d0d6f92046dffe9bcd282fdd791339b10c.tar.gz
samba-2bede9d0d6f92046dffe9bcd282fdd791339b10c.tar.bz2
samba-2bede9d0d6f92046dffe9bcd282fdd791339b10c.zip
param: Remove _SAMBA_BUILD_ checks from now the autoconf build is gone
Reviewed-by: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: David Disseldorp <ddiss@samba.org>
-rw-r--r--lib/param/loadparm.c2
-rw-r--r--lib/param/loadparm_server_role.c4
-rw-r--r--lib/param/param_table.c2
3 files changed, 0 insertions, 8 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index fdb02c3305..25997d33ee 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2177,14 +2177,12 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "winbind separator", "\\");
lpcfg_do_global_parameter(lp_ctx, "winbind sealed pipes", "True");
lpcfg_do_global_parameter(lp_ctx, "winbindd socket directory", dyn_WINBINDD_SOCKET_DIR);
-#if _SAMBA_BUILD_ >= 4
lpcfg_do_global_parameter(lp_ctx, "winbindd privileged socket directory", dyn_WINBINDD_PRIVILEGED_SOCKET_DIR);
lpcfg_do_global_parameter(lp_ctx, "ntp signd socket directory", dyn_NTP_SIGND_SOCKET_DIR);
lpcfg_do_global_parameter_var(lp_ctx, "dns update command", "%s/samba_dnsupdate", dyn_SCRIPTSBINDIR);
lpcfg_do_global_parameter_var(lp_ctx, "spn update command", "%s/samba_spnupdate", dyn_SCRIPTSBINDIR);
lpcfg_do_global_parameter_var(lp_ctx, "samba kcc command",
"%s/samba_kcc", dyn_SCRIPTSBINDIR);
-#endif
lpcfg_do_global_parameter(lp_ctx, "template shell", "/bin/false");
lpcfg_do_global_parameter(lp_ctx, "template homedir", "/home/%WORKGROUP%/%ACCOUNTNAME%");
diff --git a/lib/param/loadparm_server_role.c b/lib/param/loadparm_server_role.c
index c08834396b..7a6bc77072 100644
--- a/lib/param/loadparm_server_role.c
+++ b/lib/param/loadparm_server_role.c
@@ -108,11 +108,7 @@ int lp_find_security(int server_role, int security)
switch (server_role) {
case ROLE_DOMAIN_MEMBER:
-#if (defined(HAVE_ADS) || _SAMBA_BUILD_ >= 4)
return SEC_ADS;
-#else
- return SEC_DOMAIN;
-#endif
default:
return SEC_USER;
}
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index c65a73824f..833d3ca99b 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -48,9 +48,7 @@ static const struct enum_list enum_security[] = {
{SEC_AUTO, "AUTO"},
{SEC_USER, "USER"},
{SEC_DOMAIN, "DOMAIN"},
-#if (defined(HAVE_ADS) || _SAMBA_BUILD_ >= 4)
{SEC_ADS, "ADS"},
-#endif
{-1, NULL}
};