The branch, master has been updated
via 6cf5bdd... s4-torture: handle NT_STATUS_CONNECTION_RESET
from 259ba3a... s4:mark the SYSTEM control always as non-critical
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6cf5bdd3d389a2bf30a2cd7118061d037888ab94
Author: Andrew Tridgell <[email protected]>
Date: Thu Feb 4 20:19:05 2010 +1100
s4-torture: handle NT_STATUS_CONNECTION_RESET
a CONNECTION_RESET is now the normal "client disconnect" status code
-----------------------------------------------------------------------
Summary of changes:
source4/torture/raw/lockbench.c | 6 ++++--
source4/torture/raw/offline.c | 3 ++-
source4/torture/raw/openbench.c | 9 ++++++---
3 files changed, 12 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c
index a3fe033..98ca5f3 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 de72c88..3b8bbdd 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 2716f6a..837b7c3 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--;
--
Samba Shared Repository
