diff options
| author | Volker Lendecke <vl@samba.org> | 2012-03-14 10:31:13 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-03-15 11:00:24 +0100 |
| commit | 81ec0cc602141553045b39f54b23c40f4f668d4c (patch) | |
| tree | e2e0316c396497a8692237685a46b40251c31170 /source3 | |
| parent | 157a6916a9cccb7e43137687ec55655e954d8ab8 (diff) | |
| download | samba-81ec0cc602141553045b39f54b23c40f4f668d4c.tar.gz samba-81ec0cc602141553045b39f54b23c40f4f668d4c.tar.bz2 samba-81ec0cc602141553045b39f54b23c40f4f668d4c.zip | |
s3: Remove the separate server_id arg to notify_init
The server_id is tied to the messaging_context
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/notify_internal.c | 4 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 2 | ||||
| -rw-r--r-- | source3/smbd/service.c | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c index b01b10dd1c..4dbb331b50 100644 --- a/source3/smbd/notify_internal.c +++ b/source3/smbd/notify_internal.c @@ -84,7 +84,7 @@ static int notify_destructor(struct notify_context *notify) talloc_free(). We need the messaging_ctx to allow for notifications via internal messages */ -struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct server_id server, +struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct messaging_context *messaging_ctx, struct event_context *ev, connection_struct *conn) @@ -118,7 +118,7 @@ struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct server_id server, return NULL; } - notify->server = server; + notify->server = messaging_server_id(messaging_ctx); notify->messaging_ctx = messaging_ctx; notify->list = NULL; notify->array = NULL; diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index f9eabce0a3..0fbf9a0fcb 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -541,7 +541,7 @@ NTSTATUS inotify_watch(struct sys_notify_context *ctx, /* The following definitions come from smbd/notify_internal.c */ -struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct server_id server, +struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct messaging_context *messaging_ctx, struct event_context *ev, connection_struct *conn); diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 3b14634b6c..a78fa2921f 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -699,7 +699,6 @@ static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn, if ((!conn->printer) && (!conn->ipc)) { conn->notify_ctx = notify_init(conn, - messaging_server_id(sconn->msg_ctx), sconn->msg_ctx, sconn->ev_ctx, conn); |