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/printing | |
| parent | 8788aea643453a8d18563629220e7edd53babf41 (diff) | |
| download | samba-ab60974082e1dea0280eb4c80a48f900c0b55995.tar.gz samba-ab60974082e1dea0280eb4c80a48f900c0b55995.tar.xz 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/printing')
| -rw-r--r-- | source3/printing/printing.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 57d0c2b8a37..cfe194ab173 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -168,7 +168,9 @@ static int print_run_command(int snum,char *command, pstring_sub(syscmd, "%p", p); standard_sub_snum(snum,syscmd); - + + /* Convert script args to unix-codepage */ + dos_to_unix(syscmd, True); ret = smbrun(syscmd,outfile,False); DEBUG(3,("Running the command `%s' gave %d\n",syscmd,ret)); @@ -1202,8 +1204,7 @@ BOOL print_queue_purge(struct current_user *user, int snum, int *errcode) njobs = print_queue_status(snum, &queue, &status); for (i=0;i<njobs;i++) { - if (print_access_check(user, snum, - PRINTER_ACCESS_ADMINISTER)) { + if (print_access_check(user, snum, PRINTER_ACCESS_ADMINISTER)) { print_job_delete1(queue[i].job); } } |