diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-12-14 13:25:20 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-12-15 11:11:24 +0100 |
| commit | 03455519e70253cb86007ac5a8960999e9aa5fa4 (patch) | |
| tree | 0203cadb5d8048e82682a42e913520d0de033a40 /source3/smbd/server_reload.c | |
| parent | 5061dd26d314baf38c7e8b3f8e495579baba49de (diff) | |
| download | samba-03455519e70253cb86007ac5a8960999e9aa5fa4.tar.gz samba-03455519e70253cb86007ac5a8960999e9aa5fa4.tar.bz2 samba-03455519e70253cb86007ac5a8960999e9aa5fa4.zip | |
s3:smbd: pass smbd_server_connection and a snumused function pointer to reload_services()
metze
Diffstat (limited to 'source3/smbd/server_reload.c')
| -rw-r--r-- | source3/smbd/server_reload.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c index 0c2ea2c5b1..f15f80e13f 100644 --- a/source3/smbd/server_reload.c +++ b/source3/smbd/server_reload.c @@ -106,7 +106,8 @@ void delete_and_reload_printers(struct tevent_context *ev, Reload the services file. **************************************************************************/ -bool reload_services(struct messaging_context *msg_ctx, int smb_sock, +bool reload_services(struct smbd_server_connection *sconn, + bool (*snumused) (struct smbd_server_connection *, int), bool test) { bool ret; @@ -125,25 +126,22 @@ bool reload_services(struct messaging_context *msg_ctx, int smb_sock, if (test && !lp_file_list_changed()) return(True); - if (msg_ctx) { - lp_killunused(msg_ctx_to_sconn(msg_ctx), conn_snum_used); - } else { - lp_killunused(NULL, NULL); - } + lp_killunused(sconn, snumused); ret = lp_load(get_dyn_CONFIGFILE(), False, False, True, True); /* perhaps the config filename is now set */ - if (!test) - reload_services(msg_ctx, smb_sock, True); + if (!test) { + reload_services(sconn, snumused, true); + } reopen_logs(); load_interfaces(); - if (smb_sock != -1) { - set_socket_options(smb_sock,"SO_KEEPALIVE"); - set_socket_options(smb_sock, lp_socket_options()); + if (sconn != NULL) { + set_socket_options(sconn->sock, "SO_KEEPALIVE"); + set_socket_options(sconn->sock, lp_socket_options()); } mangle_reset_cache(); |