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 <[email protected]> Reviewed-by: Ralph Boehme <[email protected]>
tgl1986 · Jan 22, 2017 · bd8d955 · bd8d955
1 parent a551d38
commit bd8d955
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 33 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}
 	};