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>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index fdb02c33051d12550a1cd3def7de09ffc979cdb0..25997d33ee8086265096423459f55cc670a3c77f 100644 (file)
--- 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 c08834396b0dee093d8ece7c786b5a4741235b66..7a6bc7707235985e59276812fd7be02e4ca1ec93 100644 (file)
--- 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 c65a73824f8e01f85ec9bde09668e49ed0cc9f72..833d3ca99bac47250e42a37280ef12df02c03d48 100644 (file)
--- 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}
 };