From e5dd03d1991f125fa3cfddac9a41d2f9e6391c42 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 25 May 2011 18:51:56 +1000 Subject: s3-globals Remove smbd_event_context() (use server_event_context()) This has been a wrapper around server_event_context() for some time now, and removing this from dummmysmbd.c assists with library dependencies. Andrew Bartlett --- source3/smbd/server.c | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) (limited to 'source3/smbd/server.c') diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 10edb5ef45..fc6ab3a277 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -51,11 +51,6 @@ extern void start_spoolssd(struct event_context *ev_ctx, extern int dcelogin_atmost_once; #endif /* WITH_DFS */ -struct event_context *smbd_event_context(void) -{ - return server_event_context(); -} - /******************************************************************* What to do when smb.conf is updated. ********************************************************************/ @@ -258,7 +253,7 @@ static void remove_child_pid(pid_t pid, bool unclean_shutdown) if (!cleanup_te) { /* call the cleanup timer, but not too often */ int cleanup_time = lp_parm_int(-1, "smbd", "cleanuptime", 20); - cleanup_te = event_add_timed(smbd_event_context(), NULL, + cleanup_te = event_add_timed(server_event_context(), NULL, timeval_current_ofs(cleanup_time, 0), cleanup_timeout_fn, &cleanup_te); @@ -336,8 +331,8 @@ static void smbd_setup_sig_chld_handler(void) { struct tevent_signal *se; - se = tevent_add_signal(smbd_event_context(), - smbd_event_context(), + se = tevent_add_signal(server_event_context(), + server_event_context(), SIGCHLD, 0, smbd_sig_chld_handler, NULL); @@ -439,7 +434,7 @@ static void smbd_accept_connection(struct tevent_context *ev, s = NULL; status = reinit_after_fork(smbd_messaging_context(), - smbd_event_context(), procid_self(), + server_event_context(), procid_self(), true); if (!NT_STATUS_IS_OK(status)) { if (NT_STATUS_EQUAL(status, @@ -552,7 +547,7 @@ static bool smbd_open_one_socket(struct smbd_parent_context *parent, return false; } - s->fde = tevent_add_fd(smbd_event_context(), + s->fde = tevent_add_fd(server_event_context(), s, s->fd, TEVENT_FD_READ, smbd_accept_connection, @@ -733,7 +728,7 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent, return false; } - if (!(event_add_idle(smbd_event_context(), NULL, + if (!(event_add_idle(server_event_context(), NULL, timeval_set(SMBD_HOUSEKEEPING_INTERVAL, 0), "parent_housekeeping", smbd_parent_housekeeping, NULL))) { @@ -771,14 +766,14 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent, if (lp_multicast_dns_register() && (dns_port != 0)) { #ifdef WITH_DNSSD_SUPPORT - smbd_setup_mdns_registration(smbd_event_context(), + smbd_setup_mdns_registration(server_event_context(), parent, dns_port); #endif #ifdef WITH_AVAHI_SUPPORT void *avahi_conn; avahi_conn = avahi_start_register( - smbd_event_context(), smbd_event_context(), dns_port); + server_event_context(), server_event_context(), dns_port); if (avahi_conn == NULL) { DEBUG(10, ("avahi_start_register failed\n")); } @@ -797,7 +792,7 @@ static void smbd_parent_loop(struct smbd_parent_context *parent) int ret; TALLOC_CTX *frame = talloc_stackframe(); - ret = tevent_loop_once(smbd_event_context()); + ret = tevent_loop_once(server_event_context()); if (ret != 0) { exit_server_cleanly("tevent_loop_once() error"); } @@ -887,7 +882,7 @@ extern void build_options(bool screen); load_case_tables(); /* Initialize the event context, it will panic on error */ - smbd_event_context(); + server_event_context(); smbd_init_globals(); @@ -1094,7 +1089,7 @@ extern void build_options(bool screen); pidfile_create("smbd"); status = reinit_after_fork(smbd_messaging_context(), - smbd_event_context(), + server_event_context(), procid_self(), false); if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("reinit_after_fork() failed\n")); @@ -1104,7 +1099,7 @@ extern void build_options(bool screen); smbd_server_conn->msg_ctx = smbd_messaging_context(); smbd_setup_sig_term_handler(); - smbd_setup_sig_hup_handler(smbd_event_context(), + smbd_setup_sig_hup_handler(server_event_context(), smbd_server_conn->msg_ctx); /* Setup all the TDB's - including CLEAR_IF_FIRST tdb's. */ @@ -1118,7 +1113,7 @@ extern void build_options(bool screen); /* Initialise the password backed before the global_sam_sid to ensure that we fetch from ldap before we make a domain sid up */ - if(!initialize_password_db(False, smbd_event_context())) + if(!initialize_password_db(False, server_event_context())) exit(1); if (!secrets_init()) { @@ -1148,15 +1143,15 @@ extern void build_options(bool screen); if (!locking_init()) exit(1); - if (!messaging_tdb_parent_init(smbd_event_context())) { + if (!messaging_tdb_parent_init(server_event_context())) { exit(1); } - if (!notify_internal_parent_init(smbd_event_context())) { + if (!notify_internal_parent_init(server_event_context())) { exit(1); } - if (!serverid_parent_init(smbd_event_context())) { + if (!serverid_parent_init(server_event_context())) { exit(1); } @@ -1203,12 +1198,12 @@ extern void build_options(bool screen); "rpc_server", "epmapper", "none"); if (strcasecmp_m(rpcsrv_type, "daemon") == 0) { - start_epmd(smbd_event_context(), + start_epmd(server_event_context(), smbd_server_conn->msg_ctx); } } - if (!dcesrv_ep_setup(smbd_event_context(), smbd_server_conn->msg_ctx)) { + if (!dcesrv_ep_setup(server_event_context(), smbd_server_conn->msg_ctx)) { exit(1); } @@ -1223,7 +1218,7 @@ extern void build_options(bool screen); if (is_daemon && !interactive && lp_parm_bool(-1, "smbd", "backgroundqueue", true)) { - start_background_queue(smbd_event_context(), + start_background_queue(server_event_context(), smbd_messaging_context()); } @@ -1236,7 +1231,7 @@ extern void build_options(bool screen); "rpc_server", "spoolss", "embedded"); if (strcasecmp_m(rpcsrv_type, "daemon") == 0) { - start_spoolssd(smbd_event_context(), + start_spoolssd(server_event_context(), smbd_messaging_context()); } } @@ -1266,7 +1261,7 @@ extern void build_options(bool screen); return(0); } - parent = talloc_zero(smbd_event_context(), struct smbd_parent_context); + parent = talloc_zero(server_event_context(), struct smbd_parent_context); if (!parent) { exit_server("talloc(struct smbd_parent_context) failed"); } -- cgit