[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  19623b2... s3-spoolss: fix fstrings in convert_devicemode() function.
      from  1ea768b... s3:winbindd: never mark external domains as internal!

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 19623b2cd90cb2e5b028e2154bc3abea49ddcbe9
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 30 18:10:59 2009 +0100

    s3-spoolss: fix fstrings in convert_devicemode() function.
    
    Guenther
    (cherry picked from commit 753b9c6d566fafee9724a84fbd91316767c1c7a2)
    
    Fix bug #7176 (incorrect format of device mode strings).

-----------------------------------------------------------------------

Summary of changes:
 source3/rpc_server/srv_spoolss_nt.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index d580754..266b3ae 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;


-- 
Samba Shared Repository