From: Günther Deschner <gd@samba.org>
Date: Mon, 30 Nov 2009 17:10:59 +0000 (+0100)
Subject: s3-spoolss: fix fstrings in convert_devicemode() function.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19623b2cd90cb2e5b028e2154bc3abea49ddcbe9;p=thirdparty%2Fsamba.git

s3-spoolss: fix fstrings in convert_devicemode() function.

Guenther
(cherry picked from commit 753b9c6d566fafee9724a84fbd91316767c1c7a2)

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

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index d580754344b..266b3aeba49 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -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;