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-Tag: samba-4.0.0alpha9~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=753b9c6d566fafee9724a84fbd91316767c1c7a2;p=thirdparty%2Fsamba.git

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

Guenther
---

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 8d7973d13e5..d74204800af 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -1484,8 +1484,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;