summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2017-01-03 20:46:59 +1300
committerRalph Boehme <slow@samba.org>2017-01-22 18:30:12 +0100
commitbd8d9559bf8e6cdbf080902bc2460dbc12848054 (patch)
tree3bc2319eded81bf227f28693d2fe6dda6b3b6951
parenta551d3826d885f22eed33aac56df697f32f854d4 (diff)
downloadsamba-bd8d9559bf8e6cdbf080902bc2460dbc12848054.tar.gz
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>
-rwxr-xr-xdocs-xml/smbdotconf/generate-file-list.sh1
-rw-r--r--docs-xml/smbdotconf/winbind/winbinddprivilegedsocketdirectory.xml14
-rw-r--r--docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml2
-rw-r--r--dynconfig/dynconfig.c1
-rw-r--r--dynconfig/dynconfig.h1
-rw-r--r--dynconfig/wscript5
-rw-r--r--lib/param/loadparm.c1
-rwxr-xr-xselftest/target/Samba4.pm2
-rw-r--r--source3/param/loadparm.c4
-rwxr-xr-xsource4/scripting/devel/config_base1
-rw-r--r--source4/smbd/server.c1
11 files changed, 0 insertions, 33 deletions
diff --git a/docs-xml/smbdotconf/generate-file-list.sh b/docs-xml/smbdotconf/generate-file-list.sh
index 6125908bd8c..9cfcd42d693 100755
--- 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
index e8be177ad64..00000000000
--- 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 9b20fbe8aee..e88cc2a724b 100644
--- 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 961415278a0..e75d7db553a 100644
--- 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 2a45f1f35c7..4d07c103d74 100644
--- 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 2d17e7c3c67..4eaa4c0b0c4 100644
--- 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 6aa757f7c6b..a05610130e8 100644
--- 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 88551350267..dacdab40ac8 100755
--- 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 ac9ba490fb7..0ce4f92ce39 100644
--- 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 9d5a12bea50..e48d3a6ce14 100755
--- 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 407f258e8aa..b8545b89c72 100644
--- 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}
};