s3/libsmb: adjust smb2 code for new idl structs & generated ndr push/pull funcs.

[samba.git] / source3 / libsmb / cliprint.c

diff --git a/source3/libsmb/cliprint.c b/source3/libsmb/cliprint.c
index 9125c5d6a40121803edfdc9a480546ebb50d0188..c7888e9b387a1fc44fb66f429cdc1641c007296e 100644 (file)
--- a/source3/libsmb/cliprint.c
+++ b/source3/libsmb/cliprint.c
@@ -18,6 +18,9 @@
 */
 
 #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.
@@ -64,16 +67,16 @@ int cli_print_queue(struct cli_state *cli,
        p = param;
        SSVAL(p,0,76);         /* API function number 76 (DosPrintJobEnum) */
        p += 2;
-       safe_strcpy_base(p,"zWrLeh", param, sizeof(param));   /* parameter description? */
+       strlcpy_base(p,"zWrLeh", param, sizeof(param));   /* parameter description? */
        p = skip_string(param,sizeof(param),p);
-       safe_strcpy_base(p,"WWzWWDDzz", param, sizeof(param));  /* returned data format */
+       strlcpy_base(p,"WWzWWDDzz", param, sizeof(param));  /* returned data format */
        p = skip_string(param,sizeof(param),p);
-       safe_strcpy_base(p,cli->share, param, sizeof(param));    /* name of queue */
+       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;
-       safe_strcpy_base(p,"", param,sizeof(param));   /* subformat */
+       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));
@@ -99,7 +102,7 @@ int cli_print_queue(struct cli_state *cli,
                                        fix_char_ptr(SVAL(p,4), converter,
                                                     rdata, rdrcnt));
                                job.t = make_unix_date3(
-                                       p + 12, cli->serverzone);
+                                       p + 12, smb1cli_conn_server_time_zone(cli->conn));
                                job.size = IVAL(p,16);
                                fstrcpy(job.name,fix_char_ptr(SVAL(p,24),
                                                              converter,
@@ -135,9 +138,9 @@ int cli_printjob_del(struct cli_state *cli, int job)
        p = param;
        SSVAL(p,0,81);          /* DosPrintJobDel() */
        p += 2;
-       safe_strcpy_base(p,"W", param,sizeof(param));
+       strlcpy_base(p,"W", param,sizeof(param));
        p = skip_string(param,sizeof(param),p);
-       safe_strcpy_base(p,"", param,sizeof(param));
+       strlcpy_base(p,"", param,sizeof(param));
        p = skip_string(param,sizeof(param),p);
        SSVAL(p,0,job);
        p += 2;