From bd8d9559bf8e6cdbf080902bc2460dbc12848054 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 3 Jan 2017 20:46:59 +1300 Subject: 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 Reviewed-by: Ralph Boehme --- dynconfig/dynconfig.c | 1 - dynconfig/dynconfig.h | 1 - dynconfig/wscript | 5 ----- 3 files changed, 7 deletions(-) (limited to 'dynconfig') 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', -- cgit v1.2.1