#include "includes.h"
#include "winbindd.h"
-#include "../../nsswitch/libwbclient/wbc_async.h"
-#include "librpc/gen_ndr/messaging.h"
+#include "nsswitch/wb_reqtrans.h"
#include "secrets.h"
#include "../lib/util/select.h"
#include "../libcli/security/security.h"
+#include "system/select.h"
+#include "messages.h"
+#include "../lib/util/tevent_unix.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
extern bool override_logfile;
extern struct winbindd_methods cache_methods;
+static struct winbindd_child *winbindd_children = NULL;
+
/* Read some data from a client connection */
static NTSTATUS child_read_request(struct winbindd_cli_state *state)
if (!tevent_queue_add(child->queue, ev, req,
wb_child_request_trigger, NULL)) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return tevent_req_post(req, ev);
}
return req;
req, struct wb_child_request_state);
struct tevent_req *subreq;
- if ((state->child->pid == 0) && (!fork_domain_child(state->child))) {
+ if ((state->child->sock == -1) && (!fork_domain_child(state->child))) {
tevent_req_error(req, errno);
return;
}
return;
}
tevent_req_set_callback(subreq, wb_child_request_done, req);
-
- if (!tevent_req_set_endtime(req, state->ev,
- timeval_current_ofs(300, 0))) {
- tevent_req_nomem(NULL, req);
- return;
- }
+ tevent_req_set_endtime(req, state->ev, timeval_current_ofs(300, 0));
}
static void wb_child_request_done(struct tevent_req *subreq)
ret = wb_simple_trans_recv(subreq, state, &state->response, &err);
TALLOC_FREE(subreq);
if (ret == -1) {
+ /*
+ * The basic parent/child communication broke, close
+ * our socket
+ */
+ close(state->child->sock);
+ state->child->sock = -1;
+ DLIST_REMOVE(winbindd_children, state->child);
tevent_req_error(req, err);
return;
}
return 0;
}
+static bool winbindd_child_busy(struct winbindd_child *child)
+{
+ return tevent_queue_length(child->queue) > 0;
+}
+
+static struct winbindd_child *find_idle_child(struct winbindd_domain *domain)
+{
+ int i;
+
+ for (i=0; i<lp_winbind_max_domain_connections(); i++) {
+ if (!winbindd_child_busy(&domain->children[i])) {
+ return &domain->children[i];
+ }
+ }
+
+ return NULL;
+}
+
+struct winbindd_child *choose_domain_child(struct winbindd_domain *domain)
+{
+ struct winbindd_child *result;
+
+ result = find_idle_child(domain);
+ if (result != NULL) {
+ return result;
+ }
+ return &domain->children[rand() % lp_winbind_max_domain_connections()];
+}
+
+struct dcerpc_binding_handle *dom_child_handle(struct winbindd_domain *domain)
+{
+ struct winbindd_child *child;
+
+ child = choose_domain_child(domain);
+ return child->binding_handle;
+}
+
struct wb_domain_request_state {
struct tevent_context *ev;
struct winbindd_domain *domain;
+ struct winbindd_child *child;
struct winbindd_request *request;
struct winbindd_request *init_req;
struct winbindd_response *response;
return NULL;
}
+ state->child = choose_domain_child(domain);
+
if (domain->initialized) {
- subreq = wb_child_request_send(state, ev, &domain->child,
+ subreq = wb_child_request_send(state, ev, state->child,
request);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
/* The primary domain has to find the DC name itself */
state->init_req->cmd = WINBINDD_INIT_CONNECTION;
fstrcpy(state->init_req->domain_name, domain->name);
- state->init_req->data.init_conn.is_primary =
- domain->primary ? true : false;
+ state->init_req->data.init_conn.is_primary = domain->primary;
fstrcpy(state->init_req->data.init_conn.dcname, "");
- subreq = wb_child_request_send(state, ev, &domain->child,
+ subreq = wb_child_request_send(state, ev, state->child,
state->init_req);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
state->init_req->cmd = WINBINDD_GETDCNAME;
fstrcpy(state->init_req->domain_name, domain->name);
- subreq = wb_child_request_send(state, ev, &domain->child, request);
+ subreq = wb_child_request_send(state, ev, state->child, request);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
TALLOC_FREE(response);
- subreq = wb_child_request_send(state, state->ev, &state->domain->child,
+ subreq = wb_child_request_send(state, state->ev, state->child,
state->init_req);
if (tevent_req_nomem(subreq, req)) {
return;
TALLOC_FREE(response);
- subreq = wb_child_request_send(state, state->ev, &state->domain->child,
+ subreq = wb_child_request_send(state, state->ev, state->child,
state->request);
if (tevent_req_nomem(subreq, req)) {
return;
}
}
- DEBUG(1 ,("child_process_request: unknown request fn number %d\n",
+ DEBUG(1, ("child_process_request: unknown request fn number %d\n",
(int)state->request->cmd));
state->response->result = WINBINDD_ERROR;
}
"logname == NULL");
}
+ child->sock = -1;
child->domain = domain;
child->table = table;
child->queue = tevent_queue_create(NULL, "winbind_child");
SMB_ASSERT(child->binding_handle != NULL);
}
-static struct winbindd_child *winbindd_children = NULL;
-
void winbind_child_died(pid_t pid)
{
struct winbindd_child *child;
/* This will be re-added in fork_domain_child() */
DLIST_REMOVE(winbindd_children, child);
-
- close(child->sock);
- child->sock = -1;
child->pid = 0;
+
+ if (child->sock != -1) {
+ close(child->sock);
+ child->sock = -1;
+ }
}
/* Ensure any negative cache entries with the netbios or realm names are removed. */
}
messaging_send_buf(msg_ctx, *sender, MSG_WINBIND_ONLINESTATUS,
- (uint8 *)message, strlen(message) + 1);
+ (const uint8 *)message, strlen(message) + 1);
talloc_destroy(mem_ctx);
}
messaging_send_buf(msg_ctx, *sender,
MSG_WINBIND_DUMP_DOMAIN_LIST,
- (uint8_t *)message, strlen(message) + 1);
+ (const uint8_t *)message, strlen(message) + 1);
talloc_destroy(mem_ctx);
dump_event_list(winbind_event_context());
}
-bool winbindd_reinit_after_fork(const char *logfilename)
+NTSTATUS winbindd_reinit_after_fork(const struct winbindd_child *myself,
+ const char *logfilename)
{
struct winbindd_domain *domain;
struct winbindd_child *cl;
status = reinit_after_fork(
winbind_messaging_context(),
winbind_event_context(),
- procid_self(),
true);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("reinit_after_fork() failed\n"));
- return false;
+ return status;
}
close_conns_after_fork();
}
if (!winbindd_setup_sig_term_handler(false))
- return false;
+ return NT_STATUS_NO_MEMORY;
if (!winbindd_setup_sig_hup_handler(override_logfile ? NULL :
logfilename))
- return false;
+ return NT_STATUS_NO_MEMORY;
/* Stop zombies in children */
CatchChild();
* go through the parent.
*/
cl->pid = (pid_t)0;
+
+ /*
+ * Close service sockets to all other children
+ */
+ if ((cl != myself) && (cl->sock != -1)) {
+ close(cl->sock);
+ cl->sock = -1;
+ }
}
/*
* This is a little tricky, children must not
cl = idmap_child();
cl->pid = (pid_t)0;
- return true;
+ return NT_STATUS_OK;
}
/*
struct winbindd_request request;
struct winbindd_response response;
struct winbindd_domain *primary_domain = NULL;
+ NTSTATUS status;
+ ssize_t nwritten;
if (child->domain) {
DEBUG(10, ("fork_domain_child called for domain '%s'\n",
if (child->pid != 0) {
/* Parent */
+ ssize_t nread;
+
close(fdpair[0]);
+
+ nread = sys_read(fdpair[1], &status, sizeof(status));
+ if (nread != sizeof(status)) {
+ DEBUG(1, ("fork_domain_child: Could not read child status: "
+ "nread=%d, error=%s\n", (int)nread,
+ strerror(errno)));
+ close(fdpair[1]);
+ return false;
+ }
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("fork_domain_child: Child status is %s\n",
+ nt_errstr(status)));
+ close(fdpair[1]);
+ return false;
+ }
+
child->next = child->prev = NULL;
DLIST_ADD(winbindd_children, child);
child->sock = fdpair[1];
state.sock = fdpair[0];
close(fdpair[1]);
- if (!winbindd_reinit_after_fork(child->logfilename)) {
+ status = winbindd_reinit_after_fork(child, child->logfilename);
+
+ nwritten = sys_write(state.sock, &status, sizeof(status));
+ if (nwritten != sizeof(status)) {
+ DEBUG(1, ("fork_domain_child: Could not write status: "
+ "nwritten=%d, error=%s\n", (int)nwritten,
+ strerror(errno)));
+ _exit(0);
+ }
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("winbindd_reinit_after_fork failed: %s\n",
+ nt_errstr(status)));
_exit(0);
}
while (1) {
- int ret = 0;
- fd_set r_fds;
- fd_set w_fds;
- int maxfd;
+ int ret;
+ struct pollfd *pfds;
+ int num_pfds;
+ int timeout;
struct timeval t;
struct timeval *tp;
- struct timeval now;
TALLOC_CTX *frame = talloc_stackframe();
struct iovec iov[2];
int iov_count;
- NTSTATUS status;
- if (run_events(winbind_event_context(), &ret, NULL, NULL)) {
+ if (run_events_poll(winbind_event_context(), 0, NULL, 0)) {
TALLOC_FREE(frame);
continue;
}
- GetTimeOfDay(&now);
-
if (child->domain && child->domain->startup &&
(time_mono(NULL) > child->domain->startup_time + 30)) {
/* No longer in "startup" mode. */
child->domain->startup = False;
}
- FD_ZERO(&r_fds);
- FD_ZERO(&w_fds);
- FD_SET(state.sock, &r_fds);
- maxfd = state.sock;
+ pfds = talloc_zero(talloc_tos(), struct pollfd);
+ if (pfds == NULL) {
+ DEBUG(1, ("talloc failed\n"));
+ _exit(1);
+ }
- /*
- * Initialize this high as event_add_to_select_args()
- * uses a timeval_min() on this and next_event. Fix
- * from Roel van Meer <rolek@alt001.com>.
- */
- t.tv_sec = 999999;
- t.tv_usec = 0;
-
- event_add_to_select_args(winbind_event_context(), &now,
- &r_fds, &w_fds, &t, &maxfd);
+ pfds->fd = state.sock;
+ pfds->events = POLLIN|POLLHUP;
+ num_pfds = 1;
+
+ timeout = INT_MAX;
+
+ if (!event_add_to_poll_args(
+ winbind_event_context(), talloc_tos(),
+ &pfds, &num_pfds, &timeout)) {
+ DEBUG(1, ("event_add_to_poll_args failed\n"));
+ _exit(1);
+ }
tp = get_timed_events_timeout(winbind_event_context(), &t);
if (tp) {
DEBUG(11,("select will use timeout of %u.%u seconds\n",
(unsigned int)tp->tv_sec, (unsigned int)tp->tv_usec ));
}
- ret = sys_select(maxfd + 1, &r_fds, &w_fds, NULL, tp);
+ ret = poll(pfds, num_pfds, timeout);
- if (run_events(winbind_event_context(), &ret, &r_fds, &w_fds)) {
+ if (run_events_poll(winbind_event_context(), ret,
+ pfds, num_pfds)) {
/* We got a signal - continue. */
TALLOC_FREE(frame);
continue;
}
+ TALLOC_FREE(pfds);
+
if (ret == 0) {
DEBUG(11,("nothing is ready yet, continue\n"));
TALLOC_FREE(frame);
}
if (ret == -1 && errno != EINTR) {
- DEBUG(0,("select error occured\n"));
+ DEBUG(0,("poll error occured\n"));
TALLOC_FREE(frame);
- perror("select");
+ perror("poll");
_exit(1);
}
git.samba.org / samba.git / blobdiff