mirror of
https://github.com/samba-team/samba.git
synced 2025-01-12 09:18:10 +03:00
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>
This commit is contained in:
parent
157a6916a9
commit
81ec0cc602
@ -84,7 +84,7 @@ static int notify_destructor(struct notify_context *notify)
|
|||||||
talloc_free(). We need the messaging_ctx to allow for notifications
|
talloc_free(). We need the messaging_ctx to allow for notifications
|
||||||
via internal messages
|
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 messaging_context *messaging_ctx,
|
||||||
struct event_context *ev,
|
struct event_context *ev,
|
||||||
connection_struct *conn)
|
connection_struct *conn)
|
||||||
@ -118,7 +118,7 @@ struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct server_id server,
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
notify->server = server;
|
notify->server = messaging_server_id(messaging_ctx);
|
||||||
notify->messaging_ctx = messaging_ctx;
|
notify->messaging_ctx = messaging_ctx;
|
||||||
notify->list = NULL;
|
notify->list = NULL;
|
||||||
notify->array = NULL;
|
notify->array = NULL;
|
||||||
|
@ -541,7 +541,7 @@ NTSTATUS inotify_watch(struct sys_notify_context *ctx,
|
|||||||
|
|
||||||
/* The following definitions come from smbd/notify_internal.c */
|
/* 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 messaging_context *messaging_ctx,
|
||||||
struct event_context *ev,
|
struct event_context *ev,
|
||||||
connection_struct *conn);
|
connection_struct *conn);
|
||||||
|
@ -699,7 +699,6 @@ static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn,
|
|||||||
|
|
||||||
if ((!conn->printer) && (!conn->ipc)) {
|
if ((!conn->printer) && (!conn->ipc)) {
|
||||||
conn->notify_ctx = notify_init(conn,
|
conn->notify_ctx = notify_init(conn,
|
||||||
messaging_server_id(sconn->msg_ctx),
|
|
||||||
sconn->msg_ctx,
|
sconn->msg_ctx,
|
||||||
sconn->ev_ctx,
|
sconn->ev_ctx,
|
||||||
conn);
|
conn);
|
||||||
|
Loading…
Reference in New Issue
Block a user