Changeset 746 for vendor/current/source3/client/client.c

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

File:

• vendor/current/source3/client/client.c (modified) (4 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();