sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

s3-winbindd: Remove undocumented winbindd:socket dir parameter

Browse Source 
This uses the documeted "winbindd socket directory" parameter instead.

This came about due to the merge of the two smb.conf tables in s3 and
s4 for the Samba 4.0 release.  The s4 code used a real parameter,
which caused this to be documented, whereas no automatic procedure
existed to notice the parametric option and the need to document that.
The fact that this was not used consistently in both codebases is one
of the many areas of technical debt we still need to pay off here.

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Andrew Bartlett 2013-10-11 13:34:13 +13:00
parent 13495c7eb3
commit e512491552
5 changed files with 5 additions and 9 deletions
selftest/target
Samba3.pm
source3
include
proto.h
param
loadparm.c
winbindd
winbindd.cwinbindd_proto.h

2
selftest/target/Samba3.pm

@ -968,7 +968,7 @@ sub provision($$$$$$)
printing = bsd printing = bsd
printcap name = /dev/null printcap name = /dev/null
winbindd:socket dir = $wbsockdir winbindd socket directory = $wbsockdir
nmbd:socket dir = $nmbdsockdir nmbd:socket dir = $nmbdsockdir
idmap config * : range = 100000-200000 idmap config * : range = 100000-200000
winbind enum users = yes winbind enum users = yes

1
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_homedir(void);
const char *lp_template_shell(void); const char *lp_template_shell(void);
const char *lp_winbind_separator(void); const char *lp_winbind_separator(void);
const char *lp_winbindd_socket_directory(void);
bool lp_winbind_enum_users(void); bool lp_winbind_enum_users(void);
bool lp_winbind_enum_groups(void); bool lp_winbind_enum_groups(void);
bool lp_winbind_use_default_domain(void); bool lp_winbind_use_default_domain(void);

1
source3/param/loadparm.c

@ -959,6 +959,7 @@ static void init_globals(bool reinit_globals)
string_set(&Globals.szTemplateShell, "/bin/false"); string_set(&Globals.szTemplateShell, "/bin/false");
string_set(&Globals.szTemplateHomedir, "/home/%D/%U"); string_set(&Globals.szTemplateHomedir, "/home/%D/%U");
string_set(&Globals.szWinbindSeparator, "\\"); string_set(&Globals.szWinbindSeparator, "\\");
string_set(&Globals.szWinbinddSocketDirectory, dyn_WINBINDD_SOCKET_DIR);
string_set(&Globals.szCupsServer, ""); string_set(&Globals.szCupsServer, "");
string_set(&Globals.szIPrintServer, ""); string_set(&Globals.szIPrintServer, "");

9
source3/winbindd/winbindd.c

@ -189,7 +189,7 @@ static void terminate(bool is_parent)
char *path = NULL; char *path = NULL;
if (asprintf(&path, "%s/%s", if (asprintf(&path, "%s/%s",
get_winbind_pipe_dir(), WINBINDD_SOCKET_NAME) > 0) { lp_winbindd_socket_directory(), WINBINDD_SOCKET_NAME) > 0) {
unlink(path); unlink(path);
SAFE_FREE(path); SAFE_FREE(path);
} }
@ -1031,11 +1031,6 @@ static void winbindd_listen_fde_handler(struct tevent_context *ev,
* Winbindd socket accessor functions * 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) char *get_winbind_priv_pipe_dir(void)
{ {
return state_path(WINBINDD_PRIV_SOCKET_SUBDIR); return state_path(WINBINDD_PRIV_SOCKET_SUBDIR);
@ -1056,7 +1051,7 @@ static bool winbindd_setup_listeners(void)
pub_state->privileged = false; pub_state->privileged = false;
pub_state->fd = create_pipe_sock( 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) { if (pub_state->fd == -1) {
goto failed; goto failed;
} }

1
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_setup_sig_hup_handler(const char *lfile);
bool winbindd_use_idmap_cache(void); bool winbindd_use_idmap_cache(void);
bool winbindd_use_cache(void); bool winbindd_use_cache(void);
const char *get_winbind_pipe_dir(void);
char *get_winbind_priv_pipe_dir(void); char *get_winbind_priv_pipe_dir(void);
struct tevent_context *winbind_event_context(void); struct tevent_context *winbind_event_context(void);
int main(int argc, char **argv, char **envp); int main(int argc, char **argv, char **envp);