summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-06-10 15:47:26 +0200
committerMichael Adam <obnox@samba.org>2014-09-19 09:15:12 +0200
commitbf22882ed31784d1fddee0c96ede35a4d5d34b24 (patch)
tree7f75df2304dba845abb9c7564f0c6fdaef7f0069
parent7012008eb657f0b1691e1a776761619a24267d29 (diff)
downloadsamba-bf22882ed31784d1fddee0c96ede35a4d5d34b24.tar.gz
samba-bf22882ed31784d1fddee0c96ede35a4d5d34b24.tar.xz
samba-bf22882ed31784d1fddee0c96ede35a4d5d34b24.zip
s3:smbd: use sconn->client->connections in reload_services()
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r--source3/smbd/server_reload.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index 317a2507e9..e1b62d15e4 100644
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -126,10 +126,6 @@ bool reload_services(struct smbd_server_connection *sconn,
struct smbXsrv_connection *xconn = NULL;
bool ret;
- if (sconn != NULL) {
- xconn = sconn->conn;
- }
-
if (lp_loaded()) {
char *fname = lp_next_configfile(talloc_tos());
if (file_exist(fname) &&
@@ -162,7 +158,10 @@ bool reload_services(struct smbd_server_connection *sconn,
load_interfaces();
- if (xconn != NULL) {
+ if (sconn != NULL && sconn->client != NULL) {
+ xconn = sconn->client->connections;
+ }
+ for (;xconn != NULL; xconn = xconn->next) {
set_socket_options(xconn->transport.sock, "SO_KEEPALIVE");
set_socket_options(xconn->transport.sock, lp_socket_options());
}