diff options
| author | Günther Deschner <gd@samba.org> | 2009-11-30 18:10:59 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-05-06 14:19:26 +0200 |
| commit | 5fa627c4629e28921a042de31948ba36a1336b27 (patch) | |
| tree | 004063c5e7004819a5006911378da81e08c63510 | |
| parent | a9ecdb439137d22d778e4ee53093c09880953079 (diff) | |
| download | samba-5fa627c4629e28921a042de31948ba36a1336b27.tar.gz | |
s3-spoolss: fix fstrings in convert_devicemode() function.
Guenther
(cherry picked from commit 753b9c6d566fafee9724a84fbd91316767c1c7a2)
Fix bug #7176 (incorrect format of device mode strings).
(cherry picked from commit 19623b2cd90cb2e5b028e2154bc3abea49ddcbe9)
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 5a9663fe560..b1343861567 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; |