summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-09-12 17:30:51 +0200
committerVolker Lendecke <vl@samba.org>2011-09-13 11:00:13 +0200
commitd911bd5c69db0b374e61cb474c3536f925369dc6 (patch)
tree9d2e437e85280001b15f45a55a1eb107b8db911b /source3
parentd08885b0c43e86ceece8e0ce92e7419de4b65ea9 (diff)
downloadsamba-d911bd5c69db0b374e61cb474c3536f925369dc6.tar.gz
samba-d911bd5c69db0b374e61cb474c3536f925369dc6.tar.bz2
samba-d911bd5c69db0b374e61cb474c3536f925369dc6.zip
s3: Remove a reference to smbd_server_conn
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/process.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index a60d77e5c6..c7f0ade8ce 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2355,7 +2355,8 @@ static int client_get_tcp_info(int sock, struct sockaddr_storage *server,
*/
static bool keepalive_fn(const struct timeval *now, void *private_data)
{
- struct smbd_server_connection *sconn = smbd_server_conn;
+ struct smbd_server_connection *sconn = talloc_get_type_abort(
+ private_data, struct smbd_server_connection);
bool ret;
if (sconn->using_smb2) {
@@ -3115,7 +3116,7 @@ void smbd_process(struct tevent_context *ev_ctx,
&& !(event_add_idle(ev_ctx, NULL,
timeval_set(lp_keepalive(), 0),
"keepalive", keepalive_fn,
- NULL))) {
+ sconn))) {
DEBUG(0, ("Could not add keepalive event\n"));
exit(1);
}