diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-02-04 20:19:05 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-02-04 21:22:43 +1100 |
| commit | 6cf5bdd3d389a2bf30a2cd7118061d037888ab94 (patch) | |
| tree | 6ecb099c0fa2a314dc44f4fddcf8a05fad1c8dbd | |
| parent | 259ba3ab8751d0792c0ce4ddecd68f8f98cf1bd9 (diff) | |
| download | samba-6cf5bdd3d389a2bf30a2cd7118061d037888ab94.tar.gz samba-6cf5bdd3d389a2bf30a2cd7118061d037888ab94.tar.bz2 samba-6cf5bdd3d389a2bf30a2cd7118061d037888ab94.zip | |
s4-torture: handle NT_STATUS_CONNECTION_RESET
a CONNECTION_RESET is now the normal "client disconnect" status code
| -rw-r--r-- | source4/torture/raw/lockbench.c | 6 | ||||
| -rw-r--r-- | source4/torture/raw/offline.c | 3 | ||||
| -rw-r--r-- | source4/torture/raw/openbench.c | 9 |
3 files changed, 12 insertions, 6 deletions
diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c index a3fe03370f..98ca5f37a4 100644 --- a/source4/torture/raw/lockbench.c +++ b/source4/torture/raw/lockbench.c @@ -226,7 +226,8 @@ static void lock_completion(struct smbcli_request *req) state->req = NULL; if (!NT_STATUS_IS_OK(status)) { if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) || - NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) { + NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT) || + NT_STATUS_EQUAL(status, NT_STATUS_CONNECTION_RESET)) { talloc_free(state->tree); state->tree = NULL; num_connected--; @@ -264,7 +265,8 @@ static void echo_completion(struct smbcli_request *req) struct benchlock_state *state = (struct benchlock_state *)req->async.private_data; NTSTATUS status = smbcli_request_simple_recv(req); if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) || - NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) { + NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT) || + NT_STATUS_EQUAL(status, NT_STATUS_CONNECTION_RESET)) { talloc_free(state->tree); state->tree = NULL; num_connected--; diff --git a/source4/torture/raw/offline.c b/source4/torture/raw/offline.c index de72c88b5c..3b8bbdd53a 100644 --- a/source4/torture/raw/offline.c +++ b/source4/torture/raw/offline.c @@ -317,7 +317,8 @@ static void echo_completion(struct smbcli_request *req) struct offline_state *state = (struct offline_state *)req->async.private_data; NTSTATUS status = smbcli_request_simple_recv(req); if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) || - NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) { + NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT) || + NT_STATUS_EQUAL(status, NT_STATUS_CONNECTION_RESET)) { talloc_free(state->tree); state->tree = NULL; num_connected--; diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c index 2716f6a528..837b7c345a 100644 --- a/source4/torture/raw/openbench.c +++ b/source4/torture/raw/openbench.c @@ -222,7 +222,8 @@ static void open_completed(struct smbcli_request *req) state->req_open = NULL; if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) || - NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) { + NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT) || + NT_STATUS_EQUAL(status, NT_STATUS_CONNECTION_RESET)) { talloc_free(state->tree); talloc_free(state->cli); state->tree = NULL; @@ -281,7 +282,8 @@ static void close_completed(struct smbcli_request *req) state->req_close = NULL; if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) || - NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) { + NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT) || + NT_STATUS_EQUAL(status, NT_STATUS_CONNECTION_RESET)) { talloc_free(state->tree); talloc_free(state->cli); state->tree = NULL; @@ -315,7 +317,8 @@ static void echo_completion(struct smbcli_request *req) struct benchopen_state *state = (struct benchopen_state *)req->async.private_data; NTSTATUS status = smbcli_request_simple_recv(req); if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) || - NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) { + NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT) || + NT_STATUS_EQUAL(status, NT_STATUS_CONNECTION_RESET)) { talloc_free(state->tree); state->tree = NULL; num_connected--; |