summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-28 16:57:51 +0200
committerVolker Lendecke <vl@samba.org>2010-08-29 21:55:24 +0200
commit70df6fcb2ad99b173ec80bc4b678537dcac036c0 (patch)
tree54a3aeddf321d2261e4502fd68de125950247d7b
parentbabfe237171b0dc7561da0a0867d4b9bef2ee872 (diff)
downloadsamba-70df6fcb2ad99b173ec80bc4b678537dcac036c0.tar.gz
samba-70df6fcb2ad99b173ec80bc4b678537dcac036c0.tar.bz2
samba-70df6fcb2ad99b173ec80bc4b678537dcac036c0.zip
s3: Pass sconn to check_reload
This removes a use of smbd_server_fd()
-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 fbc2c79793..a0648ff27b 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2212,7 +2212,7 @@ void chain_reply(struct smb_request *req)
Check if services need reloading.
****************************************************************************/
-static void check_reload(struct messaging_context *msg_ctx, time_t t)
+static void check_reload(struct smbd_server_connection *sconn, time_t t)
{
time_t printcap_cache_time = (time_t)lp_printcap_cache_time();
@@ -2237,7 +2237,7 @@ static void check_reload(struct messaging_context *msg_ctx, time_t t)
}
if (t >= last_smb_conf_reload_time+SMBD_RELOAD_CHECK) {
- reload_services(msg_ctx, smbd_server_fd(), True);
+ reload_services(sconn->msg_ctx, sconn->sock, True);
last_smb_conf_reload_time = t;
}
@@ -2251,7 +2251,7 @@ static void check_reload(struct messaging_context *msg_ctx, time_t t)
|| (t-last_printer_reload_time < 0) )
{
DEBUG( 3,( "Printcap cache time expired.\n"));
- reload_printers(msg_ctx);
+ reload_printers(sconn->msg_ctx);
last_printer_reload_time = t;
}
}
@@ -2502,7 +2502,7 @@ static bool housekeeping_fn(const struct timeval *now, void *private_data)
update_monitored_printq_cache(sconn->msg_ctx);
/* check if we need to reload services */
- check_reload(sconn->msg_ctx, time(NULL));
+ check_reload(sconn, time(NULL));
/* Change machine password if neccessary. */
attempt_machine_password_change();