Changeset 988 for vendor/current/source3/libsmb/cliprint.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/libsmb/cliprint.c (modified) (4 diffs)

vendor/current/source3/libsmb/cliprint.c

@@ -21 +21 @@
 #include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
+#include "../libcli/smb/smbXcli_base.h"
 
 /*****************************************************************************
@@ -67 +68 @@
         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);
 
@@ -102 +103 @@
                                                      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),
@@ -138 +139 @@
         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);