summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 18:42:12 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 23:37:46 +0200
commite64bd85d90b2ccb6ee89bb5d4c5d50d3f991d423 (patch)
tree8692a5a75e1e65331078b5a7f491b6bca8fdfb26
parent53ed39de4aee1e0def1423b0c53e903d1be0741c (diff)
downloadsamba-e64bd85d90b2ccb6ee89bb5d4c5d50d3f991d423.tar.gz
samba-e64bd85d90b2ccb6ee89bb5d4c5d50d3f991d423.tar.bz2
samba-e64bd85d90b2ccb6ee89bb5d4c5d50d3f991d423.zip
s3: Lift the server_messaging_context from check_reload
-rw-r--r--source3/smbd/process.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 2e50ec7e24..1d00e12c7e 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2198,7 +2198,7 @@ void chain_reply(struct smb_request *req)
Check if services need reloading.
****************************************************************************/
-static void check_reload(time_t t)
+static void check_reload(struct messaging_context *msg_ctx, time_t t)
{
time_t printcap_cache_time = (time_t)lp_printcap_cache_time();
@@ -2223,7 +2223,7 @@ static void check_reload(time_t t)
}
if (t >= last_smb_conf_reload_time+SMBD_RELOAD_CHECK) {
- reload_services(smbd_messaging_context(), True);
+ reload_services(msg_ctx, True);
last_smb_conf_reload_time = t;
}
@@ -2237,7 +2237,7 @@ static void check_reload(time_t t)
|| (t-last_printer_reload_time < 0) )
{
DEBUG( 3,( "Printcap cache time expired.\n"));
- reload_printers(smbd_messaging_context());
+ reload_printers(msg_ctx);
last_printer_reload_time = t;
}
}
@@ -2472,7 +2472,7 @@ static bool housekeeping_fn(const struct timeval *now, void *private_data)
update_monitored_printq_cache(smbd_messaging_context());
/* check if we need to reload services */
- check_reload(time(NULL));
+ check_reload(smbd_messaging_context(), time(NULL));
/* Change machine password if neccessary. */
attempt_machine_password_change();