diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-12-14 12:39:36 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-12-15 11:03:00 +0100 |
| commit | e412b8bfcce46720b913d42ac7f56d4e024162f0 (patch) | |
| tree | 0b27b1d1b246117aa8bbbe6af5bc2c8dc6574157 /source3/smbd/server.c | |
| parent | 715933a3d3d1023df0d77c1765850e8579b84dfc (diff) | |
| download | samba-e412b8bfcce46720b913d42ac7f56d4e024162f0.tar.gz samba-e412b8bfcce46720b913d42ac7f56d4e024162f0.tar.bz2 samba-e412b8bfcce46720b913d42ac7f56d4e024162f0.zip | |
s3:smbd: split smb_conf_updated into parent and child versions
metze
Diffstat (limited to 'source3/smbd/server.c')
| -rw-r--r-- | source3/smbd/server.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 7e1bddd23b..e58128ea58 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -87,23 +87,20 @@ extern int dcelogin_atmost_once; What to do when smb.conf is updated. ********************************************************************/ -static void smb_conf_updated(struct messaging_context *msg, - void *private_data, - uint32_t msg_type, - struct server_id server_id, - DATA_BLOB *data) +static void smbd_parent_conf_updated(struct messaging_context *msg, + void *private_data, + uint32_t msg_type, + struct server_id server_id, + DATA_BLOB *data) { struct tevent_context *ev_ctx = talloc_get_type_abort(private_data, struct tevent_context); - struct smbd_server_connection *sconn = msg_ctx_to_sconn(msg); - DEBUG(10,("smb_conf_updated: Got message saying smb.conf was " + DEBUG(10,("smbd_parent_conf_updated: Got message saying smb.conf was " "updated. Reloading.\n")); change_to_root_user(); - reload_services(msg, sconn->sock, False); - if (am_parent) { - printing_subsystem_update(ev_ctx, msg, false); - } + reload_services(msg, -1, false); + printing_subsystem_update(ev_ctx, msg, false); } /******************************************************************* @@ -801,7 +798,7 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent, messaging_register(msg_ctx, NULL, MSG_SHUTDOWN, msg_exit_server); messaging_register(msg_ctx, ev_ctx, MSG_SMB_CONF_UPDATED, - smb_conf_updated); + smbd_parent_conf_updated); messaging_register(msg_ctx, NULL, MSG_SMB_STAT_CACHE_DELETE, smb_stat_cache_delete); messaging_register(msg_ctx, NULL, MSG_DEBUG, smbd_msg_debug); |