diff options
| -rwxr-xr-x | selftest/target/Samba3.pm | 2 | ||||
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 1 | ||||
| -rw-r--r-- | source3/winbindd/winbindd.c | 9 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_proto.h | 1 |
5 files changed, 5 insertions, 9 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index fbbddcc926..c3a434558f 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -968,7 +968,7 @@ sub provision($$$$$$) printing = bsd printcap name = /dev/null - winbindd:socket dir = $wbsockdir + winbindd socket directory = $wbsockdir nmbd:socket dir = $nmbdsockdir idmap config * : range = 100000-200000 winbind enum users = yes diff --git a/source3/include/proto.h b/source3/include/proto.h index 023fbd0f4a..9612a07f66 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1060,6 +1060,7 @@ char *lp_wins_hook(TALLOC_CTX *ctx); const char *lp_template_homedir(void); const char *lp_template_shell(void); const char *lp_winbind_separator(void); +const char *lp_winbindd_socket_directory(void); bool lp_winbind_enum_users(void); bool lp_winbind_enum_groups(void); bool lp_winbind_use_default_domain(void); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 3daebdb61c..62cba4df57 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -959,6 +959,7 @@ static void init_globals(bool reinit_globals) string_set(&Globals.szTemplateShell, "/bin/false"); string_set(&Globals.szTemplateHomedir, "/home/%D/%U"); string_set(&Globals.szWinbindSeparator, "\\"); + string_set(&Globals.szWinbinddSocketDirectory, dyn_WINBINDD_SOCKET_DIR); string_set(&Globals.szCupsServer, ""); string_set(&Globals.szIPrintServer, ""); diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 50573ac328..31280c216b 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -189,7 +189,7 @@ static void terminate(bool is_parent) char *path = NULL; if (asprintf(&path, "%s/%s", - get_winbind_pipe_dir(), WINBINDD_SOCKET_NAME) > 0) { + lp_winbindd_socket_directory(), WINBINDD_SOCKET_NAME) > 0) { unlink(path); SAFE_FREE(path); } @@ -1031,11 +1031,6 @@ static void winbindd_listen_fde_handler(struct tevent_context *ev, * Winbindd socket accessor functions */ -const char *get_winbind_pipe_dir(void) -{ - return lp_parm_const_string(-1, "winbindd", "socket dir", get_dyn_WINBINDD_SOCKET_DIR()); -} - char *get_winbind_priv_pipe_dir(void) { return state_path(WINBINDD_PRIV_SOCKET_SUBDIR); @@ -1056,7 +1051,7 @@ static bool winbindd_setup_listeners(void) pub_state->privileged = false; pub_state->fd = create_pipe_sock( - get_winbind_pipe_dir(), WINBINDD_SOCKET_NAME, 0755); + lp_winbindd_socket_directory(), WINBINDD_SOCKET_NAME, 0755); if (pub_state->fd == -1) { goto failed; } diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 3df7d7c8ca..cfc19d03ed 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -34,7 +34,6 @@ bool winbindd_setup_stdin_handler(bool parent, bool foreground); bool winbindd_setup_sig_hup_handler(const char *lfile); bool winbindd_use_idmap_cache(void); bool winbindd_use_cache(void); -const char *get_winbind_pipe_dir(void); char *get_winbind_priv_pipe_dir(void); struct tevent_context *winbind_event_context(void); int main(int argc, char **argv, char **envp); |