diff options
| author | David O'Neill <dmo@samba.org> | 2001-01-08 19:58:30 +0000 |
|---|---|---|
| committer | David O'Neill <dmo@samba.org> | 2001-01-08 19:58:30 +0000 |
| commit | ab60974082e1dea0280eb4c80a48f900c0b55995 (patch) | |
| tree | 2cc91e9e41768f8627609bdabced8f145acff7ca /source3/rpc_server/srv_spoolss_nt.c | |
| parent | 8788aea643453a8d18563629220e7edd53babf41 (diff) | |
| download | samba-ab60974082e1dea0280eb4c80a48f900c0b55995.tar.gz samba-ab60974082e1dea0280eb4c80a48f900c0b55995.tar.bz2 samba-ab60974082e1dea0280eb4c80a48f900c0b55995.zip | |
Changes merged from APPLIANCE_HEAD:
source/printing/printing.c
source/rpc_server/srv_spoolss_nt.c
- convert args for print command to unix codepage.
(This used to be commit 1c0ae957f8f1abee7d22a18b6df092eb2a884ae1)
Diffstat (limited to 'source3/rpc_server/srv_spoolss_nt.c')
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index bcd9b46256..74cc19eee1 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -3546,6 +3546,9 @@ static BOOL add_printer_hook(NT_PRINTER_INFO_LEVEL *printer) printer->info_2->location, driverlocation); unlink(tmp_file); + + /* Convert script args to unix-codepage */ + dos_to_unix(command, True); DEBUG(10,("Running [%s > %s]\n", command,tmp_file)); ret = smbrun(command, tmp_file, False); DEBUGADD(10,("returned [%d]\n", ret)); @@ -3556,9 +3559,10 @@ static BOOL add_printer_hook(NT_PRINTER_INFO_LEVEL *printer) } numlines = 0; + /* Get lines and convert them back to dos-codepage */ qlines = file_lines_load(tmp_file, &numlines, True); DEBUGADD(10,("Lines returned = [%d]\n", numlines)); - DEBUGADD(10,("Unlinking port file [%s]\n", tmp_file)); + DEBUGADD(10,("Unlinking script output file [%s]\n", tmp_file)); unlink(tmp_file); if(numlines) { |