Changeset 746 for vendor/current/source3/client

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

Location:

vendor/current/source3/client

Files:

• client.c (modified) (4 diffs)
• clitar.c (modified) (10 diffs)

vendor/current/source3/client/client.c

@@ -1718 +1718 @@
 
         status = cli_ntcreate(cli, name, 0,
-                              CREATE_ACCESS_READ, 0,
+                              SEC_FILE_READ_DATA | SEC_FILE_READ_ATTRIBUTE |
+                              SEC_STD_SYNCHRONIZE, 0,
                               FILE_SHARE_READ|FILE_SHARE_WRITE
                               |FILE_SHARE_DELETE,
@@ -1914 +1915 @@
         if (f == x_stdin) {
                 cli_shutdown(cli);
-                exit(0);
+                exit(rc);
         }
 
@@ -2529 +2530 @@
 
         if (!NT_STATUS_IS_OK(cli_posix_open(targetcli, targetname, O_CREAT|O_RDWR, mode, &fnum))) {
-                if (!NT_STATUS_IS_OK(cli_posix_open(targetcli, targetname, O_CREAT|O_RDONLY, mode, &fnum))) {
-                        d_printf("posix_open file %s: for read/write fnum %d\n", targetname, fnum);
+                if (NT_STATUS_IS_OK(cli_posix_open(targetcli, targetname, O_CREAT|O_RDONLY, mode, &fnum))) {
+                        d_printf("posix_open file %s: for readonly fnum %d\n", targetname, fnum);
                 } else {
                         d_printf("Failed to open file %s. %s\n", targetname, cli_errstr(cli));
@@ -4845 +4846 @@
                 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();

vendor/current/source3/client/clitar.c

@@ -209 +209 @@
                 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);
@@ -312 +314 @@
                 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;
@@ -826 +838 @@
         NTSTATUS status = NT_STATUS_OK;
 
-        if (strequal(finfo->name,"..") || strequal(finfo->name,"."))
-                return NT_STATUS_OK;
+        if (strequal(finfo->name,"..") || strequal(finfo->name,".")) {
+                status = NT_STATUS_OK;
+                goto cleanup;
+        }
 
         /* Is it on the exclude list ? */
@@ -840 +854 @@
                                 finfo->name);
                 if (!exclaim) {
-                        return NT_STATUS_NO_MEMORY;
+                        status = NT_STATUS_NO_MEMORY;
+                        goto cleanup;
                 }
 
@@ -849 +864 @@
                         DEBUG(3,("Skipping file %s\n", exclaim));
                         TALLOC_FREE(exclaim);
-                        return NT_STATUS_OK;
+                        status = NT_STATUS_OK;
+                        goto cleanup;
                 }
                 TALLOC_FREE(exclaim);
@@ -861 +877 @@
                 saved_curdir = talloc_strdup(ctx, client_get_cur_dir());
                 if (!saved_curdir) {
-                        return NT_STATUS_NO_MEMORY;
+                        status = NT_STATUS_NO_MEMORY;
+                        goto cleanup;
                 }
 
@@ -874 +891 @@
                                 finfo->name);
                 if (!new_cd) {
-                        return NT_STATUS_NO_MEMORY;
+                        status = NT_STATUS_NO_MEMORY;
+                        goto cleanup;
                 }
                 client_set_cur_dir(new_cd);
@@ -893 +911 @@
                                 client_get_cur_dir());
                 if (!mtar_mask) {
-                        return NT_STATUS_NO_MEMORY;
+                        status = NT_STATUS_NO_MEMORY;
+                        goto cleanup;
                 }
                 DEBUG(5, ("Doing list with mtar_mask: %s\n", mtar_mask));
-                status = do_list(mtar_mask, attribute, do_tar, False, True);
+                do_list(mtar_mask, attribute, do_tar, False, True);
                 client_set_cur_dir(saved_curdir);
                 TALLOC_FREE(saved_curdir);
@@ -907 +926 @@
                                         finfo->name);
                 if (!rname) {
-                        return NT_STATUS_NO_MEMORY;
+                        status = NT_STATUS_NO_MEMORY;
+                        goto cleanup;
                 }
                 status = do_atar(rname,finfo->name,finfo);
                 TALLOC_FREE(rname);
         }
+
+  cleanup:
+        TALLOC_FREE(ctx);
         return status;
 }
@@ -1019 +1042 @@
 {
         uint16_t fnum = (uint16_t) -1;
-        int pos = 0, dsize = 0, bpos = 0;
-        uint64_t rsize = 0;
+        int dsize = 0, bpos = 0;
+        uint64_t rsize = 0, pos = 0;
         NTSTATUS status;