summaryrefslogtreecommitdiffstats
path: root/source3/smbd/service.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-03-22 14:58:24 +0100
committerVolker Lendecke <vl@samba.org>2012-03-23 12:12:51 +0100
commit1cc7abf8aada94be6f35f1f81edd248801d8fe5a (patch)
tree053a7fab4e477aeade033b012b391971e8e51f22 /source3/smbd/service.c
parentad8b150b9b3a23c89c5f0542882a8f13e30ece15 (diff)
downloadsamba-1cc7abf8aada94be6f35f1f81edd248801d8fe5a.tar.gz
samba-1cc7abf8aada94be6f35f1f81edd248801d8fe5a.tar.xz
samba-1cc7abf8aada94be6f35f1f81edd248801d8fe5a.zip
s3: Remove the sys_notify dependency from notify_internal
Autobuild-User: Volker Lendecke <vl@samba.org> Autobuild-Date: Fri Mar 23 12:12:51 CET 2012 on sn-devel-104
Diffstat (limited to 'source3/smbd/service.c')
-rw-r--r--source3/smbd/service.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index d28a51a9a72..867776571b2 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -698,11 +698,15 @@ static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn,
on_err_call_dis_hook = true;
if ((!conn->printer) && (!conn->ipc) &&
- lp_change_notify(conn->params) &&
- sconn->notify_ctx == NULL) {
- sconn->notify_ctx = notify_init(sconn,
- sconn->msg_ctx,
- sconn->ev_ctx);
+ lp_change_notify(conn->params)) {
+ if (sconn->notify_ctx == NULL) {
+ sconn->notify_ctx = notify_init(
+ sconn, sconn->msg_ctx, sconn->ev_ctx);
+ }
+ if (sconn->sys_notify_ctx == NULL) {
+ sconn->sys_notify_ctx = sys_notify_context_create(
+ sconn, sconn->ev_ctx);
+ }
}
/*