diff options
| author | Stefan Metzmacher <metze@samba.org> | 2019-08-15 16:10:58 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2019-09-09 16:04:28 +0000 |
| commit | 0742879bd8d03333b8b7c2a790afebdb5f7dd92b (patch) | |
| tree | 4f647364f2a19ed85d26f6cc7fc5d7d233164d26 | |
| parent | 75e07d485944fdc76a6510bf5d450959475e7e5b (diff) | |
| download | samba-0742879bd8d03333b8b7c2a790afebdb5f7dd92b.tar.gz | |
s3:torture: fix the timeout alarm handling on LOCK9
smbXcli_conn_disconnect(alarm_cli->conn, NT_STATUS_OK)
means existing requests are not finished with an error,
but instead just keep dangling arround.
Pass NT_STATUS_LOCAL_DISCONNECT in order to fail the
cli_lock32() call after getting SIGALARM.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14113
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit e18c8ced8e7a872deb118191595425ef6b826bfa)
| -rw-r--r-- | source3/torture/torture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/torture/torture.c b/source3/torture/torture.c index f26c634b7a7..5a75796928a 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -2543,7 +2543,7 @@ static void alarm_handler(int dummy) static void alarm_handler_parent(int dummy) { - smbXcli_conn_disconnect(alarm_cli->conn, NT_STATUS_OK); + smbXcli_conn_disconnect(alarm_cli->conn, NT_STATUS_LOCAL_DISCONNECT); } static void do_local_lock(int read_fd, int write_fd) |