Changeset 733 for branches/samba-3.5.x/source3/client

Timestamp:

Nov 12, 2012, 5:09:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.13

Location:

branches/samba-3.5.x/source3/client

Files:

• client.c (modified) (1 diff)
• clitar.c (modified) (3 diffs)

branches/samba-3.5.x/source3/client/client.c

@@ -4483 +4483 @@
                 status = cli_echo(cli, 1, data_blob_const(garbage, sizeof(garbage)));
 
-                if (!NT_STATUS_IS_OK(status)) {
-                        DEBUG(0, ("SMBecho failed. Maybe server has closed "
-                                "the connection\n"));
+                if (NT_STATUS_IS_OK(status)) {
+                        return;
+                }
+
+                if (!cli_state_is_connected(cli)) {
+                        DEBUG(0, ("SMBecho failed (%s). The connection is "
+                                "disconnected now\n", nt_errstr(status)));
                         finished = true;
                         smb_readline_done();

branches/samba-3.5.x/source3/client/clitar.c

@@ -205 +205 @@
                 memset(hb.dbuf.size, 0, 4);
                 hb.dbuf.size[0]=128;
-                for (i = 8, jp=(char*)&size; i; i--)
-                        hb.dbuf.size[i+3] = *(jp++);
+                for (i = 8; i; i--) {
+                        hb.dbuf.size[i+3] = size & 0xff;
+                        size >>= 8;
+                }
         }
         oct_it((uint64_t) mtime, 13, hb.dbuf.mtime);
@@ -308 +310 @@
                 convert_time_t_to_timespec((time_t)strtol(hb->dbuf.mtime, NULL, 8));
         finfo->atime_ts = convert_time_t_to_timespec(time(NULL));
-        finfo->size = unoct(hb->dbuf.size, sizeof(hb->dbuf.size));
+        if ((hb->dbuf.size[0] & 0xff) == 0x80) {
+                /* This is a non-POSIX compatible extention to extract files
+                        greater than 8GB. */
+                finfo->size = 0;
+                for (i = 0; i < 8; i++) {
+                        finfo->size <<= 8;
+                        finfo->size |= hb->dbuf.size[i+4] & 0xff;
+                }
+        } else {
+                finfo->size = unoct(hb->dbuf.size, sizeof(hb->dbuf.size));
+        }
 
         return True;
@@ -1000 +1012 @@
 {
         uint16_t fnum;
-        int pos = 0, dsize = 0, bpos = 0;
-        uint64_t rsize = 0;
+        int dsize = 0, bpos = 0;
+        uint64_t rsize = 0, pos = 0;
 
         DEBUG(5, ("get_file: file: %s, size %.0f\n", finfo.name, (double)finfo.size));