From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 22 Jul 2011 07:34:29 +0000 (+0200)
Subject: s3:torture: use cli_state_disconnect() to close the socket on SIGALRM
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=cd71c5746b7fb40349b13b6a3f80f85a7b1a4fa8;p=metze%2Fsamba%2Fwip.git

s3:torture: use cli_state_disconnect() to close the socket on SIGALRM

metze
---

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index fbfe52d83f86..c197de98cb60 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -2501,7 +2501,7 @@ fail:
  */
 
 static bool got_alarm;
-static int alarm_fd;
+static struct cli_state *alarm_cli;
 
 static void alarm_handler(int dummy)
 {
@@ -2510,7 +2510,7 @@ static void alarm_handler(int dummy)
 
 static void alarm_handler_parent(int dummy)
 {
-	close(alarm_fd);
+	cli_state_disconnect(alarm_cli);
 }
 
 static void do_local_lock(int read_fd, int write_fd)
@@ -2661,7 +2661,7 @@ static bool run_locktest9(int dummy)
 	}
 
 	/* Wait 20 seconds for the lock. */
-	alarm_fd = cli1->fd;
+	alarm_cli = cli1;
 	CatchSignal(SIGALRM, alarm_handler_parent);
 	alarm(20);