s3:smbd: use sconn->client->connections in keepalive_fn()
authorStefan Metzmacher <metze@samba.org>
Mon, 15 Sep 2014 02:07:43 +0000 (04:07 +0200)
committerMichael Adam <obnox@samba.org>
Fri, 19 Sep 2014 07:15:12 +0000 (09:15 +0200)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
source3/smbd/process.c

index 3f9b18c9f196639c0d8d338b65b0215ee342bacf..280f86246a201366c40f66f8dbc22e90d672935a 100644 (file)
@@ -2731,7 +2731,7 @@ static bool keepalive_fn(const struct timeval *now, void *private_data)
 {
        struct smbd_server_connection *sconn = talloc_get_type_abort(
                private_data, struct smbd_server_connection);
-       struct smbXsrv_connection *xconn = sconn->conn;
+       struct smbXsrv_connection *xconn = NULL;
        bool ret;
 
        if (sconn->using_smb2) {
@@ -2739,6 +2739,10 @@ static bool keepalive_fn(const struct timeval *now, void *private_data)
                return false;
        }
 
+       /*
+        * With SMB1 we only have 1 connection
+        */
+       xconn = sconn->client->connections;
        smbd_lock_socket(xconn);
        ret = send_keepalive(xconn->transport.sock);
        smbd_unlock_socket(xconn);