s3/libsmb: adjust smb2 code for new idl structs & generated ndr push/pull funcs.
[samba.git] / source3 / libsmb / cliprint.c
index 732241a758f28557ba4987fb388d89ec1cdba315..c7888e9b387a1fc44fb66f429cdc1641c007296e 100644 (file)
@@ -1,85 +1,87 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    client print routines
    Copyright (C) Andrew Tridgell 1994-1998
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define NO_SYSLOG
-
 #include "includes.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
+#include "../libcli/smb/smbXcli_base.h"
 
 /*****************************************************************************
  Convert a character pointer in a cli_call_api() response to a form we can use.
- This function contains code to prevent core dumps if the server returns 
+ This function contains code to prevent core dumps if the server returns
  invalid data.
 *****************************************************************************/
-static const char *fix_char_ptr(unsigned int datap, unsigned int converter, 
+static const char *fix_char_ptr(unsigned int datap, unsigned int converter,
                          char *rdata, int rdrcnt)
 {
-       if (datap == 0) {       /* turn NULL pointers into zero length strings */
+       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];
 }
 
-
 /****************************************************************************
 call fn() on each entry in a print queue
 ****************************************************************************/
-int cli_print_queue(struct cli_state *cli, 
+
+int cli_print_queue(struct cli_state *cli,
                    void (*fn)(struct print_job_info *))
 {
        char *rparam = NULL;
        char *rdata = NULL;
        char *p;
        unsigned int rdrcnt, rprcnt;
-       pstring param;
+       char param[1024];
        int result_code=0;
        int i = -1;
-       
+
        memset(param,'\0',sizeof(param));
 
        p = param;
        SSVAL(p,0,76);         /* API function number 76 (DosPrintJobEnum) */
        p += 2;
-       pstrcpy_base(p,"zWrLeh", param);   /* parameter description? */
-       p = skip_string(p,1);
-       pstrcpy_base(p,"WWzWWDDzz", param);  /* returned data format */
-       p = skip_string(p,1);
-       pstrcpy_base(p,cli->share, param);    /* name of queue */
-       p = skip_string(p,1);
+       strlcpy_base(p,"zWrLeh", param, sizeof(param));   /* parameter description? */
+       p = skip_string(param,sizeof(param),p);
+       strlcpy_base(p,"WWzWWDDzz", param, sizeof(param));  /* returned data format */
+       p = skip_string(param,sizeof(param),p);
+       strlcpy_base(p,cli->share, param, sizeof(param));    /* name of queue */
+       p = skip_string(param,sizeof(param),p);
        SSVAL(p,0,2);   /* API function level 2, PRJINFO_2 data structure */
        SSVAL(p,2,1000); /* size of bytes of returned data buffer */
        p += 4;
-       pstrcpy_base(p,"", param);   /* subformat */
-       p = skip_string(p,1);
+       strlcpy_base(p,"", param,sizeof(param));   /* subformat */
+       p = skip_string(param,sizeof(param),p);
 
        DEBUG(4,("doing cli_print_queue for %s\n", cli->share));
 
-       if (cli_api(cli, 
+       if (cli_api(cli,
                    param, PTR_DIFF(p,param), 1024,  /* Param, length, maxlen */
                    NULL, 0, CLI_BUFFER_SIZE,            /* data, length, maxlen */
                    &rparam, &rprcnt,                /* return params, length */
@@ -90,21 +92,22 @@ int cli_print_queue(struct cli_state *cli,
 
                if (result_code == 0) {
                        struct print_job_info job;
-                       
-                       p = rdata; 
+
+                       p = rdata;
 
                        for (i = 0; i < SVAL(rparam,4); ++i) {
                                job.id = SVAL(p,0);
                                job.priority = SVAL(p,2);
                                fstrcpy(job.user,
-                                       fix_char_ptr(SVAL(p,4), converter, 
+                                       fix_char_ptr(SVAL(p,4), converter,
                                                     rdata, rdrcnt));
-                               job.t = make_unix_date3(p + 12);
+                               job.t = make_unix_date3(
+                                       p + 12, smb1cli_conn_server_time_zone(cli->conn));
                                job.size = IVAL(p,16);
-                               fstrcpy(job.name,fix_char_ptr(SVAL(p,24), 
-                                                             converter, 
+                               fstrcpy(job.name,fix_char_ptr(SVAL(p,24),
+                                                             converter,
                                                              rdata, rdrcnt));
-                               fn(&job);                               
+                               fn(&job);
                                p += 28;
                        }
                }
@@ -120,6 +123,7 @@ int cli_print_queue(struct cli_state *cli,
 /****************************************************************************
   cancel a print job
   ****************************************************************************/
+
 int cli_printjob_del(struct cli_state *cli, int job)
 {
        char *rparam = NULL;
@@ -127,21 +131,21 @@ int cli_printjob_del(struct cli_state *cli, int job)
        char *p;
        unsigned int rdrcnt,rprcnt;
        int ret = -1;
-       pstring param;
+       char param[1024];
 
        memset(param,'\0',sizeof(param));
 
        p = param;
        SSVAL(p,0,81);          /* DosPrintJobDel() */
        p += 2;
-       pstrcpy_base(p,"W", param);
-       p = skip_string(p,1);
-       pstrcpy_base(p,"", param);
-       p = skip_string(p,1);
-       SSVAL(p,0,job);     
+       strlcpy_base(p,"W", param,sizeof(param));
+       p = skip_string(param,sizeof(param),p);
+       strlcpy_base(p,"", param,sizeof(param));
+       p = skip_string(param,sizeof(param),p);
+       SSVAL(p,0,job);
        p += 2;
-       
-       if (cli_api(cli, 
+
+       if (cli_api(cli,
                    param, PTR_DIFF(p,param), 1024,  /* Param, length, maxlen */
                    NULL, 0, CLI_BUFFER_SIZE,            /* data, length, maxlen */
                    &rparam, &rprcnt,                /* return params, length */
@@ -154,110 +158,3 @@ int cli_printjob_del(struct cli_state *cli, int job)
 
        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);
-
-       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, int fnum)
-{
-       memset(cli->outbuf,'\0',smb_size);
-       memset(cli->inbuf,'\0',smb_size);
-
-       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);
-}
-
-