Changeset 745 for trunk/server/source3/libsmb/cliprint.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/libsmb/cliprint.c (modified) (7 diffs)

trunk/server/source3/libsmb/cliprint.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
 
 /*****************************************************************************
@@ -28 +30 @@
                           char *rdata, int rdrcnt)
 {
+        unsigned int offset;
+
         if (datap == 0) {
                 /* turn NULL pointers into zero length strings */
                 return "";
-        } else {
-                unsigned int offset = datap - converter;
-
-                if (offset >= rdrcnt) {
-                        DEBUG(1,("bad char ptr: datap=%u, converter=%u rdrcnt=%d>",
-                                 datap, converter, rdrcnt));
-                        return "<ERROR>";
-                } else {
-                        return &rdata[offset];
-                }
-        }
+        }
+
+        offset = datap - converter;
+
+        if (offset >= rdrcnt) {
+                DEBUG(1,("bad char ptr: datap=%u, converter=%u rdrcnt=%d>",
+                         datap, converter, rdrcnt));
+                return "<ERROR>";
+        }
+        return &rdata[offset];
 }
 
@@ -98 +101 @@
                                         fix_char_ptr(SVAL(p,4), converter,
                                                      rdata, rdrcnt));
-                                job.t = cli_make_unix_date3(cli, p + 12);
+                                job.t = make_unix_date3(
+                                        p + 12, cli->serverzone);
                                 job.size = IVAL(p,16);
                                 fstrcpy(job.name,fix_char_ptr(SVAL(p,24),
@@ -152 +156 @@
         p = skip_string(param,sizeof(param),p);
 
-        DEBUG(4,("doing cli_print_queue for %s\n", cli->share));
+        DEBUG(4,("doing cli_print_queue_state for %s\n", cli->share));
 
         if (cli_api(cli,
@@ -174 +178 @@
                                         fix_char_ptr(SVAL(p,4), converter,
                                                      rdata, rdrcnt));
-                                job.t = cli_make_unix_date3(cli, p + 12);
+                                job.t = make_unix_date3(
+                                        p + 12, cli->serverzone);
                                 job.size = IVAL(p,16);
                                 fstrcpy(job.name,fix_char_ptr(SVAL(p,24),
@@ -192 +197 @@
 }
 #endif
-
 /****************************************************************************
   cancel a print job
@@ -231 +235 @@
         return ret;
 }
-
-
-/****************************************************************************
- Open a spool file
-****************************************************************************/
-
-int cli_spl_open(struct cli_state *cli, const char *fname, int flags, int share_mode)
-{
-        char *p;
-        unsigned openfn=0;
-        unsigned accessmode=0;
-
-        if (flags & O_CREAT)
-                openfn |= (1<<4);
-        if (!(flags & O_EXCL)) {
-                if (flags & O_TRUNC)
-                        openfn |= (1<<1);
-                else
-                        openfn |= (1<<0);
-        }
-
-        accessmode = (share_mode<<4);
-
-        if ((flags & O_ACCMODE) == O_RDWR) {
-                accessmode |= 2;
-        } else if ((flags & O_ACCMODE) == O_WRONLY) {
-                accessmode |= 1;
-        }
-
-#if defined(O_SYNC)
-        if ((flags & O_SYNC) == O_SYNC) {
-                accessmode |= (1<<14);
-        }
-#endif /* O_SYNC */
-
-        if (share_mode == DENY_FCB) {
-                accessmode = 0xFF;
-        }
-
-        memset(cli->outbuf,'\0',smb_size);
-        memset(cli->inbuf,'\0',smb_size);
-
-        cli_set_message(cli->outbuf,15,0,True);
-
-        SCVAL(cli->outbuf,smb_com,SMBsplopen);
-        SSVAL(cli->outbuf,smb_tid,cli->cnum);
-        cli_setup_packet(cli);
-
-        SSVAL(cli->outbuf,smb_vwv0,0xFF);
-        SSVAL(cli->outbuf,smb_vwv2,0);  /* no additional info */
-        SSVAL(cli->outbuf,smb_vwv3,accessmode);
-        SSVAL(cli->outbuf,smb_vwv4,aSYSTEM | aHIDDEN);
-        SSVAL(cli->outbuf,smb_vwv5,0);
-        SSVAL(cli->outbuf,smb_vwv8,openfn);
-
-        if (cli->use_oplocks) {
-                /* if using oplocks then ask for a batch oplock via
-                   core and extended methods */
-                SCVAL(cli->outbuf,smb_flg, CVAL(cli->outbuf,smb_flg)|
-                        FLAG_REQUEST_OPLOCK|FLAG_REQUEST_BATCH_OPLOCK);
-                SSVAL(cli->outbuf,smb_vwv2,SVAL(cli->outbuf,smb_vwv2) | 6);
-        }
-
-        p = smb_buf(cli->outbuf);
-        p += clistr_push(cli, p, fname, -1, STR_TERMINATE);
-
-        cli_setup_bcc(cli, p);
-
-        cli_send_smb(cli);
-        if (!cli_receive_smb(cli)) {
-                return -1;
-        }
-
-        if (cli_is_error(cli)) {
-                return -1;
-        }
-
-        return SVAL(cli->inbuf,smb_vwv2);
-}
-
-/****************************************************************************
- Close a file.
-****************************************************************************/
-
-bool cli_spl_close(struct cli_state *cli, uint16_t fnum)
-{
-        memset(cli->outbuf,'\0',smb_size);
-        memset(cli->inbuf,'\0',smb_size);
-
-        cli_set_message(cli->outbuf,3,0,True);
-
-        SCVAL(cli->outbuf,smb_com,SMBsplclose);
-        SSVAL(cli->outbuf,smb_tid,cli->cnum);
-        cli_setup_packet(cli);
-
-        SSVAL(cli->outbuf,smb_vwv0,fnum);
-        SIVALS(cli->outbuf,smb_vwv1,-1);
-
-        cli_send_smb(cli);
-        if (!cli_receive_smb(cli)) {
-                return False;
-        }
-
-        return !cli_is_error(cli);
-}