From ac7b63384d3f8afdb768f95e7744380f4df07d76 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 15 Aug 2010 16:13:00 +0200 Subject: s3: Lift smbd_server_fd from reload_services() --- source3/smbd/server_reload.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'source3/smbd/server_reload.c') 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(); -- cgit