param: Remove winbindd privileged socket directory option

This option is unused and has not been used since before Samba 4.3
when the source4/ winbindd code went away.

The associated dynconfig parameters used for the default are also removed.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=10066

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/docs-xml/smbdotconf/generate-file-list.sh b/docs-xml/smbdotconf/generate-file-list.sh
index 6125908bd8c7aea9dba1c3ae3eb0b284cf333694..9cfcd42d69349711a506736c03ab1c39a232ab6d 100755 (executable)
--- a/docs-xml/smbdotconf/generate-file-list.sh
+++ b/docs-xml/smbdotconf/generate-file-list.sh
@@ -13,7 +13,6 @@ echo "<!DOCTYPE section [
 <!ENTITY pathconfig.PRIVATE_DIR          '\${prefix}/private'>
 <!ENTITY pathconfig.SMB_PASSWD_FILE      '\${prefix}/private/smbpasswd'>
 <!ENTITY pathconfig.WINBINDD_SOCKET_DIR  '\${prefix}/var/run/winbindd'>
-<!ENTITY pathconfig.WINBINDD_PRIVILEGED_SOCKET_DIR '\${prefix}/var/lib/winbindd_privileged'>
 <!ENTITY pathconfig.CACHEDIR             '\${prefix}/var/cache'>
 <!ENTITY pathconfig.NTP_SIGND_SOCKET_DIR '\${prefix}/var/lib/ntp_signd'>
 ]>"

diff --git a/docs-xml/smbdotconf/winbind/winbinddprivilegedsocketdirectory.xml b/docs-xml/smbdotconf/winbind/winbinddprivilegedsocketdirectory.xml
deleted file mode 100644 (file)
index e8be177..0000000
--- a/docs-xml/smbdotconf/winbind/winbinddprivilegedsocketdirectory.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<samba:parameter name="winbindd privileged socket directory"
-                 context="G"
-                 type="string"
-                 constant="1"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-       <para>This setting controls the location of the winbind daemon's privileged
-               socket.</para>
-</description>
-
-<related>winbindd socket directory</related>
-
-<value type="default">&pathconfig.WINBINDD_PRIVILEGED_SOCKET_DIR;</value>
-</samba:parameter>

diff --git a/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml b/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml
index 9b20fbe8aee139c58156f9f05843ef542f942140..e88cc2a724b954630eb070cc455a0959e07ab3c9 100644 (file)
--- a/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml
+++ b/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml
@@ -12,7 +12,5 @@
        varaible.</para>
 </description>
 
-<related>winbindd privileged socket directory</related>
-
 <value type="default">&pathconfig.WINBINDD_SOCKET_DIR;</value>
 </samba:parameter>

diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c
index 961415278a042b58069875b1fb32edc1dbde9f71..e75d7db553ae4d4475b5bad59064e71e04548825 100644 (file)
--- a/dynconfig/dynconfig.c
+++ b/dynconfig/dynconfig.c
@@ -100,7 +100,6 @@ DEFINE_DYN_CONFIG_PARAM(NMBDSOCKETDIR)
 DEFINE_DYN_CONFIG_PARAM(DATADIR)
 DEFINE_DYN_CONFIG_PARAM(SETUPDIR)
 DEFINE_DYN_CONFIG_PARAM(WINBINDD_SOCKET_DIR) /* from winbind_struct_protocol.h in s3 autoconf */
-DEFINE_DYN_CONFIG_PARAM(WINBINDD_PRIVILEGED_SOCKET_DIR)
 DEFINE_DYN_CONFIG_PARAM(NTP_SIGND_SOCKET_DIR)
 DEFINE_DYN_CONFIG_PARAM(PYTHONDIR)
 DEFINE_DYN_CONFIG_PARAM(PYTHONARCHDIR)

diff --git a/dynconfig/dynconfig.h b/dynconfig/dynconfig.h
index 2a45f1f35c7e63a191887995c41dd13d28cf3381..4d07c103d742bcae038f8e607dd8fd2fd1fad911 100644 (file)
--- a/dynconfig/dynconfig.h
+++ b/dynconfig/dynconfig.h
@@ -51,7 +51,6 @@ DEFINE_DYN_CONFIG_PROTO(NMBDSOCKETDIR)
 DEFINE_DYN_CONFIG_PROTO(DATADIR)
 DEFINE_DYN_CONFIG_PROTO(SETUPDIR)
 DEFINE_DYN_CONFIG_PROTO(WINBINDD_SOCKET_DIR)
-DEFINE_DYN_CONFIG_PROTO(WINBINDD_PRIVILEGED_SOCKET_DIR)
 DEFINE_DYN_CONFIG_PROTO(NTP_SIGND_SOCKET_DIR)
 DEFINE_DYN_CONFIG_PROTO(PYTHONDIR)
 DEFINE_DYN_CONFIG_PROTO(PYTHONARCHDIR)

diff --git a/dynconfig/wscript b/dynconfig/wscript
index 2d17e7c3c672ee26be88af5eca1903bd450a0cf1..4eaa4c0b0c483abead4ba8f9ecc99f2c3f8d1051 100644 (file)
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -221,11 +221,6 @@ dynconfig = {
          'FHS-PATH':  '${SOCKET_DIR}/winbindd',
          'DELAY':     True,
     },
-    'WINBINDD_PRIVILEGED_SOCKET_DIR' : {
-         'STD-PATH':  '${PRIVILEGED_SOCKET_DIR}/winbindd_privileged',
-         'FHS-PATH':  '${PRIVILEGED_SOCKET_DIR}/winbindd_privileged',
-         'DELAY':     True,
-    },
     'NMBDSOCKETDIR' : {
          'STD-PATH':  '${SOCKET_DIR}/nmbd',
          'FHS-PATH':  '${SOCKET_DIR}/nmbd',

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 6aa757f7c6bb23ab35778ff093b3e77dbbf7b9bc..a05610130e8d2c81803ef4eb8c9cce2825d6a6b4 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2648,7 +2648,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lpcfg_do_global_parameter(lp_ctx, "winbind sealed pipes", "True");
        lpcfg_do_global_parameter(lp_ctx, "require strong key", "True");
        lpcfg_do_global_parameter(lp_ctx, "winbindd socket directory", dyn_WINBINDD_SOCKET_DIR);
-       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);

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 88551350267c4878ff6b1fb7b24cbcdc2c6a496c..dacdab40ac8bc5931f51511566820e088599abf3 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -442,7 +442,6 @@ sub provision_raw_prepare($$$$$$$$$$$)
        $ctx->{statedir} = "$prefix_abs/statedir";
        $ctx->{cachedir} = "$prefix_abs/cachedir";
        $ctx->{winbindd_socket_dir} = "$prefix_abs/winbindd_socket";
-       $ctx->{winbindd_privileged_socket_dir} = "$prefix_abs/winbindd_privileged_socket";
        $ctx->{ntp_signd_socket_dir} = "$prefix_abs/ntp_signd_socket";
        $ctx->{nsswrap_passwd} = "$ctx->{etcdir}/passwd";
        $ctx->{nsswrap_group} = "$ctx->{etcdir}/group";
@@ -560,7 +559,6 @@ sub provision_raw_step1($$)
        state directory = $ctx->{statedir}
        cache directory = $ctx->{cachedir}
        winbindd socket directory = $ctx->{winbindd_socket_dir}
-       winbindd privileged socket directory = $ctx->{winbindd_privileged_socket_dir}
        ntp signd socket directory = $ctx->{ntp_signd_socket_dir}
        winbind separator = /
        interfaces = $ctx->{interfaces}

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index ac9ba490fb717ea85ea53cafa4fca07257c51c4a..0ce4f92ce3972b0035b6980fa061abb787d740ec 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -890,10 +890,6 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        lpcfg_string_set(Globals.ctx, &Globals.ntp_signd_socket_directory,
                         get_dyn_NTP_SIGND_SOCKET_DIR());
 
-       lpcfg_string_set(Globals.ctx,
-                        &Globals.winbindd_privileged_socket_directory,
-                        get_dyn_WINBINDD_PRIVILEGED_SOCKET_DIR());
-
        s = talloc_asprintf(talloc_tos(), "%s/samba_kcc", get_dyn_SCRIPTSBINDIR());
        if (s == NULL) {
                smb_panic("init_globals: ENOMEM");

diff --git a/source4/scripting/devel/config_base b/source4/scripting/devel/config_base
index 9d5a12bea50ba96795456bf95ce3f2b915ff4b62..e48d3a6ce1420bcb66961fcd25947fbf6485a13a 100755 (executable)
--- a/source4/scripting/devel/config_base
+++ b/source4/scripting/devel/config_base
@@ -13,7 +13,6 @@ vars = {
     "lock dir" : "${PREFIX}/var/locks",
     "pid directory" : "${PREFIX}/var/run",
     "winbindd socket directory" : "${PREFIX}/var/run/winbindd",
-    "winbindd privileged socket directory" : "${PREFIX}/var/lib/winbindd_privileged",
     "ntp signd socket directory" : "${PREFIX}/var/run/ntp_signd"
 }
 

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 407f258e8aa0e64e22ef840a019f9d2f920d992f..b8545b89c72bba58821240285254da0bd0eb4c1f 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -264,7 +264,6 @@ static void show_build(void)
                CONFIG_OPTION(CODEPAGEDIR),
                CONFIG_OPTION(SETUPDIR),
                CONFIG_OPTION(WINBINDD_SOCKET_DIR),
-               CONFIG_OPTION(WINBINDD_PRIVILEGED_SOCKET_DIR),
                CONFIG_OPTION(NTP_SIGND_SOCKET_DIR),
                { NULL, NULL}
        };