diff options
| -rw-r--r-- | source3/winbindd/winbindd.c | 20 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_proto.h | 6 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_util.c | 43 |
3 files changed, 20 insertions, 49 deletions
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 5e041fb57b..c899360a61 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -938,6 +938,20 @@ static void winbindd_listen_fde_handler(struct tevent_context *ev, new_connection(s->fd, s->privileged); } +/* + * Winbindd socket accessor functions + */ + +const char *get_winbind_pipe_dir(void) +{ + return lp_parm_const_string(-1, "winbindd", "socket dir", WINBINDD_SOCKET_DIR); +} + +char *get_winbind_priv_pipe_dir(void) +{ + return lock_path(WINBINDD_PRIV_SOCKET_SUBDIR); +} + static bool winbindd_setup_listeners(void) { struct winbindd_listen_state *pub_state = NULL; @@ -951,7 +965,8 @@ static bool winbindd_setup_listeners(void) } pub_state->privileged = false; - pub_state->fd = open_winbindd_socket(); + pub_state->fd = create_pipe_sock( + get_winbind_pipe_dir(), WINBINDD_SOCKET_NAME, 0755); if (pub_state->fd == -1) { goto failed; } @@ -972,7 +987,8 @@ static bool winbindd_setup_listeners(void) } priv_state->privileged = true; - priv_state->fd = open_winbindd_priv_socket(); + priv_state->fd = create_pipe_sock( + get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME, 0750); if (priv_state->fd == -1) { goto failed; } diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 1b086734bc..49e66f22c8 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -52,6 +52,8 @@ bool winbindd_setup_sig_hup_handler(const char *lfile); bool winbindd_use_idmap_cache(void); bool winbindd_use_cache(void); void winbindd_register_handlers(void); +const char *get_winbind_pipe_dir(void); +char *get_winbind_priv_pipe_dir(void); int main(int argc, char **argv, char **envp); /* The following definitions come from winbindd/winbindd_ads.c */ @@ -416,10 +418,6 @@ char *fill_domain_username_talloc(TALLOC_CTX *ctx, const char *domain, const char *user, bool can_assume); -const char *get_winbind_pipe_dir(void) ; -char *get_winbind_priv_pipe_dir(void) ; -int open_winbindd_socket(void); -int open_winbindd_priv_socket(void); struct winbindd_cli_state *winbindd_client_list(void); void winbindd_add_client(struct winbindd_cli_state *cli); void winbindd_remove_client(struct winbindd_cli_state *cli); diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index 970e599e2b..735a446e07 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -1029,49 +1029,6 @@ char *fill_domain_username_talloc(TALLOC_CTX *mem_ctx, } /* - * Winbindd socket accessor functions - */ - -const char *get_winbind_pipe_dir(void) -{ - return lp_parm_const_string(-1, "winbindd", "socket dir", WINBINDD_SOCKET_DIR); -} - -char *get_winbind_priv_pipe_dir(void) -{ - return lock_path(WINBINDD_PRIV_SOCKET_SUBDIR); -} - -/* Open the winbindd socket */ - -static int _winbindd_socket = -1; -static int _winbindd_priv_socket = -1; - -int open_winbindd_socket(void) -{ - if (_winbindd_socket == -1) { - _winbindd_socket = create_pipe_sock( - get_winbind_pipe_dir(), WINBINDD_SOCKET_NAME, 0755); - DEBUG(10, ("open_winbindd_socket: opened socket fd %d\n", - _winbindd_socket)); - } - - return _winbindd_socket; -} - -int open_winbindd_priv_socket(void) -{ - if (_winbindd_priv_socket == -1) { - _winbindd_priv_socket = create_pipe_sock( - get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME, 0750); - DEBUG(10, ("open_winbindd_priv_socket: opened socket fd %d\n", - _winbindd_priv_socket)); - } - - return _winbindd_priv_socket; -} - -/* * Client list accessor functions */ |