Copyright (C) Andrew Tridgell 2002
Copyright (C) Jelmer Vernooij 2003
Copyright (C) Volker Lendecke 2004
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
{
static struct messaging_context *ctx;
- if (!ctx && !(ctx = messaging_init(NULL, server_id_self(),
- winbind_event_context()))) {
- smb_panic("Could not init winbind messaging context");
+ if (ctx == NULL) {
+ ctx = messaging_init(NULL, server_id_self(),
+ winbind_event_context());
+ }
+ if (ctx == NULL) {
+ DEBUG(0, ("Could not init winbind messaging context.\n"));
}
return ctx;
}
/* Reload configuration */
-static bool reload_services_file(void)
+static bool reload_services_file(const char *lfile)
{
bool ret;
if (lp_loaded()) {
const char *fname = lp_configfile();
- if (file_exist(fname,NULL) && !strcsequal(fname,get_dyn_CONFIGFILE())) {
+ if (file_exist(fname) && !strcsequal(fname,get_dyn_CONFIGFILE())) {
set_dyn_CONFIGFILE(fname);
}
}
+ /* if this is a child, restore the logfile to the special
+ name - <domain>, idmap, etc. */
+ if (lfile && *lfile) {
+ lp_set_logfile(lfile);
+ }
+
reopen_logs();
ret = lp_load(get_dyn_CONFIGFILE(),False,False,True,True);
DEBUG(0, ("winbindd status:\n"));
/* Print client state information */
-
+
DEBUG(0, ("\t%d clients currently active\n", winbindd_num_clients()));
-
+
if (DEBUGLEVEL >= 2 && winbindd_num_clients()) {
DEBUG(2, ("\tclient list:\n"));
for(tmp = winbindd_client_list(); tmp; tmp = tmp->next) {
/* Handle the signal by unlinking socket and exiting */
-static void terminate(void)
+static void terminate(bool is_parent)
{
- char *path = NULL;
-
- /* Remove socket file */
- if (asprintf(&path, "%s/%s",
+ if (is_parent) {
+ /* When parent goes away we should
+ * remove the socket file. Not so
+ * when children terminate.
+ */
+ char *path = NULL;
+
+ if (asprintf(&path, "%s/%s",
get_winbind_pipe_dir(), WINBINDD_SOCKET_NAME) > 0) {
- unlink(path);
- SAFE_FREE(path);
+ unlink(path);
+ SAFE_FREE(path);
+ }
}
idmap_close();
-
+
trustdom_cache_shutdown();
#if 0
exit(0);
}
-static bool do_sigterm;
+static SIG_ATOMIC_T do_sigterm = 0;
static void termination_handler(int signum)
{
- do_sigterm = True;
+ do_sigterm = 1;
sys_select_signal(signum);
}
-static bool do_sigusr2;
+static SIG_ATOMIC_T do_sigusr2 = 0;
static void sigusr2_handler(int signum)
{
- do_sigusr2 = True;
+ do_sigusr2 = 1;
sys_select_signal(SIGUSR2);
}
-static bool do_sighup;
+static SIG_ATOMIC_T do_sighup = 0;
static void sighup_handler(int signum)
{
- do_sighup = True;
+ do_sighup = 1;
sys_select_signal(SIGHUP);
}
-static bool do_sigchld;
+static SIG_ATOMIC_T do_sigchld = 0;
static void sigchld_handler(int signum)
{
- do_sigchld = True;
+ do_sigchld = 1;
sys_select_signal(SIGCHLD);
}
{
/* Flush various caches */
flush_caches();
- reload_services_file();
+ reload_services_file((const char *) private_data);
}
/* React on 'smbcontrol winbindd shutdown' in the same way as on SIGTERM*/
struct server_id server_id,
DATA_BLOB *data)
{
- do_sigterm = True;
+ do_sigterm = 1;
}
void (*fn)(struct winbindd_cli_state *state);
const char *winbindd_cmd_name;
} dispatch_table[] = {
-
+
/* User functions */
{ WINBINDD_GETPWNAM, winbindd_getpwnam, "GETPWNAM" },
{ WINBINDD_SID_TO_GID, winbindd_sid_to_gid, "SID_TO_GID" },
{ WINBINDD_UID_TO_SID, winbindd_uid_to_sid, "UID_TO_SID" },
{ WINBINDD_GID_TO_SID, winbindd_gid_to_sid, "GID_TO_SID" },
-#if 0 /* DISABLED until we fix the interface in Samba 3.0.26 --jerry */
- { WINBINDD_SIDS_TO_XIDS, winbindd_sids_to_unixids, "SIDS_TO_XIDS" },
-#endif /* end DISABLED */
{ WINBINDD_ALLOCATE_UID, winbindd_allocate_uid, "ALLOCATE_UID" },
{ WINBINDD_ALLOCATE_GID, winbindd_allocate_gid, "ALLOCATE_GID" },
{ WINBINDD_SET_MAPPING, winbindd_set_mapping, "SET_MAPPING" },
+ { WINBINDD_REMOVE_MAPPING, winbindd_remove_mapping, "REMOVE_MAPPING" },
{ WINBINDD_SET_HWM, winbindd_set_hwm, "SET_HWMS" },
/* Miscellaneous */
{ WINBINDD_WINS_BYNAME, winbindd_wins_byname, "WINS_BYNAME" },
{ WINBINDD_WINS_BYIP, winbindd_wins_byip, "WINS_BYIP" },
-
+
/* End of list */
{ WINBINDD_NUM_CMDS, NULL, "NONE" }
static void request_recv(void *private_data, bool success);
static void request_main_recv(void *private_data, bool success);
static void request_finished(struct winbindd_cli_state *state);
-void request_finished_cont(void *private_data, bool success);
static void response_main_sent(void *private_data, bool success);
static void response_extra_sent(void *private_data, bool success);
struct winbindd_cli_state *state =
talloc_get_type_abort(private_data, struct winbindd_cli_state);
- if (state->mem_ctx != NULL) {
- talloc_destroy(state->mem_ctx);
- state->mem_ctx = NULL;
- }
+ TALLOC_FREE(state->mem_ctx);
if (!success) {
state->finished = True;
return;
}
- SAFE_FREE(state->request.extra_data.data);
SAFE_FREE(state->response.extra_data.data);
setup_async_read(&state->fd_event, &state->request, sizeof(uint32),
}
if (state->response.length == sizeof(state->response)) {
- if (state->mem_ctx != NULL) {
- talloc_destroy(state->mem_ctx);
- state->mem_ctx = NULL;
- }
+ TALLOC_FREE(state->mem_ctx);
setup_async_read(&state->fd_event, &state->request,
sizeof(uint32), request_len_recv, state);
static void request_finished(struct winbindd_cli_state *state)
{
+ /* Make sure request.extra_data is freed when finish processing a request */
+ SAFE_FREE(state->request.extra_data.data);
setup_async_write(&state->fd_event, &state->response,
sizeof(state->response), response_main_sent, state);
}
request_finished(state);
}
-void request_finished_cont(void *private_data, bool success)
-{
- struct winbindd_cli_state *state =
- talloc_get_type_abort(private_data, struct winbindd_cli_state);
-
- if (success)
- request_ok(state);
- else
- request_error(state);
-}
-
static void request_len_recv(void *private_data, bool success)
{
struct winbindd_cli_state *state =
struct winbindd_cli_state *state;
socklen_t len;
int sock;
-
+
/* Accept connection */
-
+
len = sizeof(sunaddr);
do {
if (sock == -1)
return;
-
+
DEBUG(6,("accepted socket %d\n", sock));
-
+
/* Create new connection structure */
-
+
if ((state = TALLOC_ZERO_P(NULL, struct winbindd_cli_state)) == NULL) {
close(sock);
return;
}
-
+
state->sock = sock;
state->last_access = time(NULL);
request_len_recv, state);
/* Add to connection list */
-
+
winbindd_add_client(state);
}
static void remove_client(struct winbindd_cli_state *state)
{
+ char c = 0;
+
/* It's a dead client - hold a funeral */
-
+
if (state == NULL) {
return;
}
-
+
+ /* tell client, we are closing ... */
+ write(state->sock, &c, sizeof(c));
+
/* Close socket */
-
+
close(state->sock);
-
+
/* Free any getent state */
-
+
free_getent_state(state->getpwent_state);
free_getent_state(state->getgrent_state);
-
+
/* We may have some extra data that was not freed if the client was
killed unexpectedly */
SAFE_FREE(state->response.extra_data.data);
- if (state->mem_ctx != NULL) {
- talloc_destroy(state->mem_ctx);
- state->mem_ctx = NULL;
- }
+ TALLOC_FREE(state->mem_ctx);
remove_fd_event(&state->fd_event);
-
+
/* Remove from list and free */
-
+
winbindd_remove_client(state);
TALLOC_FREE(state);
}
}
/* check if HUP has been received and reload files */
-void winbind_check_sighup(void)
+void winbind_check_sighup(const char *lfile)
{
if (do_sighup) {
DEBUG(3, ("got SIGHUP\n"));
flush_caches();
- reload_services_file();
+ reload_services_file(lfile);
- do_sighup = False;
+ do_sighup = 0;
}
}
/* check if TERM has been received */
-void winbind_check_sigterm(void)
+void winbind_check_sigterm(bool is_parent)
{
if (do_sigterm)
- terminate();
+ terminate(is_parent);
}
/* Process incoming clients on listen_sock. We use a tricky non-blocking,
}
/* Call select */
-
+
selret = sys_select(maxfd + 1, &r_fds, &w_fds, NULL, &timeout);
if (selret == 0) {
/* new, non-privileged connection */
new_connection(listen_sock, False);
}
-
+
if (FD_ISSET(listen_priv_sock, &r_fds)) {
while (winbindd_num_clients() >
WINBINDD_MAX_SIMULTANEOUS_CLIENTS - 1) {
/* Check signal handling things */
- winbind_check_sigterm();
- winbind_check_sighup();
+ winbind_check_sigterm(true);
+ winbind_check_sighup(NULL);
if (do_sigusr2) {
print_winbindd_status();
- do_sigusr2 = False;
+ do_sigusr2 = 0;
}
if (do_sigchld) {
pid_t pid;
- do_sigchld = False;
+ do_sigchld = 0;
while ((pid = sys_waitpid(-1, NULL, WNOHANG)) > 0) {
winbind_child_died(pid);
load_case_tables();
- db_tdb2_setup_messaging(NULL, false);
-
/* Initialise for running in non-root mode */
sec_init();
poptFreeContext(pc);
if (!override_logfile) {
- char *logfile = NULL;
- if (asprintf(&logfile,"%s/log.winbindd",
+ char *lfile = NULL;
+ if (asprintf(&lfile,"%s/log.winbindd",
get_dyn_LOGFILEBASE()) > 0) {
- lp_set_logfile(logfile);
- SAFE_FREE(logfile);
+ lp_set_logfile(lfile);
+ SAFE_FREE(lfile);
}
}
setup_logging("winbindd", log_stdout);
/* Initialise messaging system */
if (winbind_messaging_context() == NULL) {
- DEBUG(0, ("unable to initialize messaging system\n"));
exit(1);
}
- db_tdb2_setup_messaging(winbind_messaging_context(), true);
-
- if (!reload_services_file()) {
+ if (!reload_services_file(NULL)) {
DEBUG(0, ("error opening config file\n"));
exit(1);
}
- if (!directory_exist(lp_lockdir(), NULL)) {
+ if (!directory_exist(lp_lockdir())) {
mkdir(lp_lockdir(), 0755);
}
namecache_enable();
- /* Winbind daemon initialisation */
-
- if ( ! NT_STATUS_IS_OK(idmap_init_cache()) ) {
- DEBUG(1, ("Could not init idmap cache!\n"));
- }
-
/* Unblock all signals we are interested in as they may have been
blocked by the parent process. */
BlockSignals(False, SIGCHLD);
/* Setup signal handlers */
-
+
CatchSignal(SIGINT, termination_handler); /* Exit on these sigs */
CatchSignal(SIGQUIT, termination_handler);
CatchSignal(SIGTERM, termination_handler);
MSG_WINBIND_DUMP_DOMAIN_LIST,
winbind_msg_dump_domain_list);
+ /* Register handler for MSG_DEBUG. */
+ messaging_register(winbind_messaging_context(), NULL,
+ MSG_DEBUG,
+ winbind_msg_debug);
+
netsamlogon_cache_init(); /* Non-critical */
-
+
/* clear the cached list of trusted domains */
wcache_tdc_clear();
-
+
if (!init_domain_list()) {
DEBUG(0,("unable to initialize domain list\n"));
exit(1);
git.samba.org / bbaumbach / samba-autobuild / .git / blobdiff