Changeset 740 for vendor/current/source4/torture/raw/lockbench.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/torture/raw/lockbench.c (modified) (6 diffs)

vendor/current/source4/torture/raw/lockbench.c ¶

@@ -21 +21 @@
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
@@ -189 +188 @@
         io->in.dest_host    = state->dest_host;
         io->in.dest_ports   = state->dest_ports;
-        io->in.gensec_settings = lp_gensec_settings(state->mem_ctx, state->tctx->lp_ctx);
-        io->in.socket_options = lp_socket_options(state->tctx->lp_ctx);
+        io->in.gensec_settings = lpcfg_gensec_settings(state->mem_ctx, state->tctx->lp_ctx);
+        io->in.socket_options = lpcfg_socket_options(state->tctx->lp_ctx);
         io->in.called_name  = state->called_name;
         io->in.service      = share;
@@ -196 +195 @@
         io->in.credentials  = cmdline_credentials;
         io->in.fallback_to_anonymous = false;
-        io->in.workgroup    = lp_workgroup(state->tctx->lp_ctx);
-        io->in.iconv_convenience = lp_iconv_convenience(state->tctx->lp_ctx);
-        lp_smbcli_options(state->tctx->lp_ctx, &io->in.options);
-        lp_smbcli_session_options(state->tctx->lp_ctx, &io->in.session_options);
+        io->in.workgroup    = lpcfg_workgroup(state->tctx->lp_ctx);
+        lpcfg_smbcli_options(state->tctx->lp_ctx, &io->in.options);
+        lpcfg_smbcli_session_options(state->tctx->lp_ctx, &io->in.session_options);
 
         /* kill off the remnants of the old connection */
@@ -206 +204 @@
 
         ctx = smb_composite_connect_send(io, state->mem_ctx, 
-                                         lp_resolve_context(state->tctx->lp_ctx),
+                                         lpcfg_resolve_context(state->tctx->lp_ctx),
                                          state->ev);
         if (ctx == NULL) {
@@ -228 +226 @@
         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;
@@ -266 +265 @@
         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;