]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3-spoolss: fix fstrings in convert_devicemode() function.
authorGünther Deschner <gd@samba.org>
Mon, 30 Nov 2009 17:10:59 +0000 (18:10 +0100)
committerKarolin Seeger <kseeger@samba.org>
Mon, 1 Mar 2010 10:13:24 +0000 (11:13 +0100)
Guenther
(cherry picked from commit 753b9c6d566fafee9724a84fbd91316767c1c7a2)

Fix bug #7176 (incorrect format of device mode strings).

source3/rpc_server/srv_spoolss_nt.c

index d580754344b1ce1c651173d3c73f2fc6a35037c1..266b3aeba496eebd11ed16e96c7befc716cd0384 100644 (file)
@@ -1481,8 +1481,11 @@ bool convert_devicemode(const char *printername,
                        return false;
        }
 
-       rpcstr_push(nt_devmode->devicename, devmode->devicename, 31, 0);
-       rpcstr_push(nt_devmode->formname, devmode->formname, 31, 0);
+       fstrcpy(nt_devmode->devicename, devmode->devicename);
+       fstrcpy(nt_devmode->formname, devmode->formname);
+
+       nt_devmode->devicename[31] = '\0';
+       nt_devmode->formname[31] = '\0';
 
        nt_devmode->specversion         = devmode->specversion;
        nt_devmode->driverversion       = devmode->driverversion;