Changeset 228 for branches/samba-3.2.x/source/client/client.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/client/client.c (modified) (5 diffs)

branches/samba-3.2.x/source/client/client.c

@@ -4343 +4343 @@
 }
 
+static bool finished;
+
 /****************************************************************************
  Make sure we swallow keepalives during idle time.
@@ -4389 +4391 @@
                                   "the connection\n"));
 
+                        finished = true;
+                        smb_readline_done();
                         if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
                                 set_smb_read_error(&cli->smb_rw_error,
@@ -4417 +4421 @@
                 unsigned char garbage[16];
                 memset(garbage, 0xf0, sizeof(garbage));
-                cli_echo(cli, 1, garbage, sizeof(garbage));
+                if (!cli_echo(cli, 1, garbage, sizeof(garbage))) {
+                        DEBUG(0, ("SMBecho failed. Maybe server has closed "
+                                  "the connection\n"));
+                        smb_readline_done();
+                        finished = true;
+                }
         }
 }
@@ -4429 +4438 @@
         int rc = 0;
 
-        while (1) {
+        while (!finished) {
                 TALLOC_CTX *frame = talloc_stackframe();
                 char *tok = NULL;
@@ -4606 +4615 @@
         fstrcat(server_name, name_type_hex);
 
-        zero_addr(&ss);
+        zero_sockaddr(&ss);
         if (have_ip)
                 ss = dest_ss;