Changeset 740 for vendor/current/source3/client/smbspool.c

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/client/smbspool.c (modified) (6 diffs)

vendor/current/source3/client/smbspool.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "system/passwd.h"
+#include "libsmb/libsmb.h"
 
 /*
@@ -241 +244 @@
          */
 
-        setup_logging("smbspool", True);
+        setup_logging("smbspool", DEBUG_STDOUT);
 
         lp_set_in_client(True); /* Make sure that we tell lp_load we are */
@@ -402 +405 @@
         *need_auth = false;
         nt_status = cli_start_connection(&cli, myname, server, NULL, port,
-                                         Undefined, flags, NULL);
+                                         Undefined, flags);
         if (!NT_STATUS_IS_OK(nt_status)) {
                 fprintf(stderr, "ERROR: Connection failed: %s\n", nt_errstr(nt_status));
@@ -559 +562 @@
         char            buffer[8192],   /* Buffer for copy */
                        *ptr;    /* Pointer into title */
+        NTSTATUS nt_status;
 
 
@@ -575 +579 @@
          */
 
-        if (!NT_STATUS_IS_OK(cli_open(cli, title, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum))) {
+        nt_status = cli_open(cli, title, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE,
+                          &fnum);
+        if (!NT_STATUS_IS_OK(nt_status)) {
                 fprintf(stderr, "ERROR: %s opening remote spool %s\n",
-                        cli_errstr(cli), title);
-                return (get_exit_code(cli, cli_nt_error(cli)));
+                        nt_errstr(nt_status), title);
+                return get_exit_code(cli, nt_status);
         }
 
@@ -591 +597 @@
 
         while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0) {
-                if (cli_write(cli, fnum, 0, buffer, tbytes, nbytes) != nbytes) {
-                        int status = get_exit_code(cli, cli_nt_error(cli));
-
-                        fprintf(stderr, "ERROR: Error writing spool: %s\n", cli_errstr(cli));
-                        fprintf(stderr, "DEBUG: Returning status %d...\n", status);
+                NTSTATUS status;
+
+                status = cli_writeall(cli, fnum, 0, (uint8_t *)buffer,
+                                      tbytes, nbytes, NULL);
+                if (!NT_STATUS_IS_OK(status)) {
+                        int ret = get_exit_code(cli, status);
+                        fprintf(stderr, "ERROR: Error writing spool: %s\n",
+                                nt_errstr(status));
+                        fprintf(stderr, "DEBUG: Returning status %d...\n",
+                                ret);
                         cli_close(cli, fnum);
 
-                        return (status);
+                        return (ret);
                 }
                 tbytes += nbytes;
         }
 
-        if (!NT_STATUS_IS_OK(cli_close(cli, fnum))) {
+        nt_status = cli_close(cli, fnum);
+        if (!NT_STATUS_IS_OK(nt_status)) {
                 fprintf(stderr, "ERROR: %s closing remote spool %s\n",
-                        cli_errstr(cli), title);
-                return (get_exit_code(cli, cli_nt_error(cli)));
+                        nt_errstr(nt_status), title);
+                return get_exit_code(cli, nt_status);
         } else {
                 return (0);