diff options
author | Christof Schmitt <cs@samba.org> | 2018-08-21 11:06:16 -0700 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2018-09-07 17:26:17 +0200 |
commit | ae7db3e543d412864fafb0d0303c2219ce344526 (patch) | |
tree | 3963543ad7e047dbfc292022f0b7574804e45642 /source3/rpc_server | |
parent | 94852e3544bf2cace3ddba8b9c89d986d77fdab5 (diff) | |
download | samba-ae7db3e543d412864fafb0d0303c2219ce344526.tar.gz |
s3: Rename server_event_context() to global_event_context()
This reflects that the event context is also used outside of the server
processes.
The command used for the rename:
find . -name '*.[hc]' -print0 | xargs -0 sed -i 's/server_event_context/global_event_context/'
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'source3/rpc_server')
-rw-r--r-- | source3/rpc_server/fss/srv_fss_agent.c | 4 | ||||
-rw-r--r-- | source3/rpc_server/mdssvc/mdssvc.c | 6 | ||||
-rw-r--r-- | source3/rpc_server/samr/srv_samr_nt.c | 2 | ||||
-rw-r--r-- | source3/rpc_server/spoolss/srv_spoolss_nt.c | 18 |
4 files changed, 15 insertions, 15 deletions
diff --git a/source3/rpc_server/fss/srv_fss_agent.c b/source3/rpc_server/fss/srv_fss_agent.c index ab7f9055939..03c2668171b 100644 --- a/source3/rpc_server/fss/srv_fss_agent.c +++ b/source3/rpc_server/fss/srv_fss_agent.c @@ -527,7 +527,7 @@ static void fss_seq_tout_set(TALLOC_CTX *mem_ctx, memcpy(sc_set_id, &sc_set->id, sizeof(*sc_set_id)); } - tmr = tevent_add_timer(server_event_context(), + tmr = tevent_add_timer(global_event_context(), mem_ctx, timeval_current_ofs(tout, 0), fss_seq_tout_handler, sc_set_id); @@ -948,7 +948,7 @@ uint32_t _fss_CommitShadowCopySet(struct pipes_struct *p, for (sc = sc_set->scs; sc; sc = sc->next) { char *base_path; char *snap_path; - status = commit_sc_with_conn(frame, server_event_context(), + status = commit_sc_with_conn(frame, global_event_context(), p->msg_ctx, p->session_info, sc, &base_path, &snap_path); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/rpc_server/mdssvc/mdssvc.c b/source3/rpc_server/mdssvc/mdssvc.c index 5a63d379738..7c996941cfa 100644 --- a/source3/rpc_server/mdssvc/mdssvc.c +++ b/source3/rpc_server/mdssvc/mdssvc.c @@ -772,7 +772,7 @@ static void tracker_cursor_cb(GObject *object, SLQ_DEBUG(10, slq, "closed"); g_main_loop_quit(slq->mds_ctx->gmainloop); - req = slq_destroy_send(slq, server_event_context(), &slq); + req = slq_destroy_send(slq, global_event_context(), &slq); if (req == NULL) { slq->state = SLQ_STATE_ERROR; return; @@ -1166,7 +1166,7 @@ static bool slrpc_open_query(struct mds_ctx *mds_ctx, slq->last_used = timeval_current(); slq->start_time = slq->last_used; slq->expire_time = timeval_add(&slq->last_used, MAX_SL_RUNTIME, 0); - slq->te = tevent_add_timer(server_event_context(), slq, + slq->te = tevent_add_timer(global_event_context(), slq, slq->expire_time, slq_close_timer, slq); if (slq->te == NULL) { DEBUG(1, ("tevent_add_timer failed\n")); @@ -1361,7 +1361,7 @@ static bool slrpc_fetch_query_results(struct mds_ctx *mds_ctx, TALLOC_FREE(slq->te); slq->last_used = timeval_current(); slq->expire_time = timeval_add(&slq->last_used, MAX_SL_RUNTIME, 0); - slq->te = tevent_add_timer(server_event_context(), slq, + slq->te = tevent_add_timer(global_event_context(), slq, slq->expire_time, slq_close_timer, slq); if (slq->te == NULL) { DEBUG(1, ("tevent_add_timer failed\n")); diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c index adc9e41e49e..00497efc96e 100644 --- a/source3/rpc_server/samr/srv_samr_nt.c +++ b/source3/rpc_server/samr/srv_samr_nt.c @@ -308,7 +308,7 @@ static void set_disp_info_cache_timeout(DISP_INFO *disp_info, time_t secs_fromno (unsigned int)secs_fromnow )); disp_info->cache_timeout_event = tevent_add_timer( - server_event_context(), NULL, + global_event_context(), NULL, timeval_current_ofs(secs_fromnow, 0), disp_info_cache_idle_timeout_handler, (void *)disp_info); } diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index 2bdce560c38..ac76e7e6e1b 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -6043,7 +6043,7 @@ WERROR _spoolss_WritePrinter(struct pipes_struct *p, return WERR_INVALID_HANDLE; /* print_job_write takes care of checking for PJOB_SMBD_SPOOLING */ - buffer_written = print_job_write(server_event_context(),p->msg_ctx, + buffer_written = print_job_write(global_event_context(),p->msg_ctx, snum, Printer->jobid, (const char *)r->in.data.data, (size_t)r->in._data_size); @@ -6544,7 +6544,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, DEBUG(10,("update_printer: changing driver [%s]! Sending event!\n", printer->drivername)); - notify_printer_driver(server_event_context(), msg_ctx, + notify_printer_driver(global_event_context(), msg_ctx, snum, printer->drivername ? printer->drivername : ""); } @@ -6572,7 +6572,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, } if (!force_update) { - notify_printer_comment(server_event_context(), msg_ctx, + notify_printer_comment(global_event_context(), msg_ctx, snum, printer->comment ? printer->comment : ""); } @@ -6600,7 +6600,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, } if (!force_update) { - notify_printer_sharename(server_event_context(), + notify_printer_sharename(global_event_context(), msg_ctx, snum, printer->sharename ? printer->sharename : ""); @@ -6641,7 +6641,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, } if (!force_update) { - notify_printer_printername(server_event_context(), + notify_printer_printername(global_event_context(), msg_ctx, snum, p ? p : ""); } @@ -6671,7 +6671,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, } if (!force_update) { - notify_printer_port(server_event_context(), + notify_printer_port(global_event_context(), msg_ctx, snum, printer->portname ? printer->portname : ""); } @@ -6699,7 +6699,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, } if (!force_update) { - notify_printer_location(server_event_context(), + notify_printer_location(global_event_context(), msg_ctx, snum, printer->location ? printer->location : ""); @@ -6728,7 +6728,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, } if (!force_update) { - notify_printer_sepfile(server_event_context(), + notify_printer_sepfile(global_event_context(), msg_ctx, snum, printer->sepfile ? printer->sepfile : ""); @@ -7718,7 +7718,7 @@ static WERROR spoolss_setjob_1(TALLOC_CTX *mem_ctx, return WERR_OK; } - if (!print_job_set_name(server_event_context(), msg_ctx, + if (!print_job_set_name(global_event_context(), msg_ctx, printer_name, job_id, r->document_name)) { return WERR_INVALID_HANDLE; } |