summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-28 16:56:47 +0200
committerVolker Lendecke <vl@samba.org>2010-08-29 21:55:24 +0200
commitbabfe237171b0dc7561da0a0867d4b9bef2ee872 (patch)
tree03e9d2380fc7a081dc45461bac1cb1e354e32e07
parent4a58c640cce3b37d5eef62caddd15f64ef8befbe (diff)
downloadsamba-babfe237171b0dc7561da0a0867d4b9bef2ee872.tar.gz
samba-babfe237171b0dc7561da0a0867d4b9bef2ee872.tar.bz2
samba-babfe237171b0dc7561da0a0867d4b9bef2ee872.zip
s3: Pass sconn instead of msg_ctx to housekeeping_fn
-rw-r--r--source3/smbd/process.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index a18f04521f..fbc2c79793 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2494,15 +2494,15 @@ static bool deadtime_fn(const struct timeval *now, void *private_data)
static bool housekeeping_fn(const struct timeval *now, void *private_data)
{
- struct messaging_context *msg_ctx = talloc_get_type_abort(
- private_data, struct messaging_context);
+ struct smbd_server_connection *sconn = talloc_get_type_abort(
+ private_data, struct smbd_server_connection);
change_to_root_user();
/* update printer queue caches if necessary */
- update_monitored_printq_cache(msg_ctx);
+ update_monitored_printq_cache(sconn->msg_ctx);
/* check if we need to reload services */
- check_reload(msg_ctx, time(NULL));
+ check_reload(sconn->msg_ctx, time(NULL));
/* Change machine password if neccessary. */
attempt_machine_password_change();
@@ -3069,8 +3069,7 @@ void smbd_process(struct smbd_server_connection *sconn)
if (!(event_add_idle(smbd_event_context(), NULL,
timeval_set(SMBD_SELECT_TIMEOUT, 0),
- "housekeeping", housekeeping_fn,
- sconn->msg_ctx))) {
+ "housekeeping", housekeeping_fn, sconn))) {
DEBUG(0, ("Could not add housekeeping event\n"));
exit(1);
}