diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-15 16:13:00 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-18 11:18:21 +0200 |
| commit | ac7b63384d3f8afdb768f95e7744380f4df07d76 (patch) | |
| tree | a568644b63e97912f17e010c83065c1eb38ab909 /source3/smbd/server_reload.c | |
| parent | 59289d4fa9e5f6f2ff6abd13e8f07ca6ee3e2a3c (diff) | |
| download | samba-ac7b63384d3f8afdb768f95e7744380f4df07d76.tar.gz samba-ac7b63384d3f8afdb768f95e7744380f4df07d76.tar.bz2 samba-ac7b63384d3f8afdb768f95e7744380f4df07d76.zip | |
s3: Lift smbd_server_fd from reload_services()
Diffstat (limited to 'source3/smbd/server_reload.c')
| -rw-r--r-- | source3/smbd/server_reload.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c index e1d563d09d..38d1f3a354 100644 --- a/source3/smbd/server_reload.c +++ b/source3/smbd/server_reload.c @@ -88,7 +88,8 @@ void reload_printers(struct messaging_context *msg_ctx) Reload the services file. **************************************************************************/ -bool reload_services(struct messaging_context *msg_ctx, bool test) +bool reload_services(struct messaging_context *msg_ctx, int smb_sock, + bool test) { bool ret; @@ -114,15 +115,15 @@ bool reload_services(struct messaging_context *msg_ctx, bool test) /* perhaps the config filename is now set */ if (!test) - reload_services(msg_ctx, True); + reload_services(msg_ctx, smb_sock, True); reopen_logs(); load_interfaces(); - if (smbd_server_fd() != -1) { - set_socket_options(smbd_server_fd(),"SO_KEEPALIVE"); - set_socket_options(smbd_server_fd(), lp_socket_options()); + if (smb_sock != -1) { + set_socket_options(smb_sock,"SO_KEEPALIVE"); + set_socket_options(smb_sock, lp_socket_options()); } mangle_reset_cache(); |