diff options
| author | Jeremy Allison <jra@samba.org> | 2001-03-16 05:55:30 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-03-16 05:55:30 +0000 |
| commit | 65d35749b721b76ae826a9423bdefd2f673f35c6 (patch) | |
| tree | 8b8cf83fdcbf25f70efa5da0c8178743586f358a /source3/param | |
| parent | 977e0be9b3b01b9deecea905b78d81d3c58726a1 (diff) | |
| download | samba-65d35749b721b76ae826a9423bdefd2f673f35c6.tar.gz samba-65d35749b721b76ae826a9423bdefd2f673f35c6.tar.bz2 samba-65d35749b721b76ae826a9423bdefd2f673f35c6.zip | |
Added Michael Sweet's CUPS patch to call directly into the CUPS backend.
Parameterises the printing functions so other backends can be plugged
directly in (this is a good thing :-).
Jeremy.
(This used to be commit c0345bbaed5d1aac777f1a33ff84ad1899f2ed6d)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 8ea1d2e816..85329e8c53 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1068,16 +1068,22 @@ static void init_printer_values(void) break; case PRINT_CUPS: - string_set(&sDefault.szLpqcommand, - "/usr/bin/lpstat -o%p"); - string_set(&sDefault.szLprmcommand, - "/usr/bin/cancel %p-%j"); - string_set(&sDefault.szPrintcommand, - "/usr/bin/lp -d%p -oraw %s; rm %s"); - string_set(&sDefault.szQueuepausecommand, - "/usr/bin/disable %p"); - string_set(&sDefault.szQueueresumecommand, - "/usr/bin/enable %p"); + string_set(&Globals.szPrintcapname, "cups"); +#ifdef HAVE_LIBCUPS + string_set(&sDefault.szLpqcommand, ""); + string_set(&sDefault.szLprmcommand, ""); + string_set(&sDefault.szPrintcommand, ""); + string_set(&sDefault.szLppausecommand, ""); + string_set(&sDefault.szLpresumecommand, ""); + string_set(&sDefault.szQueuepausecommand, ""); + string_set(&sDefault.szQueueresumecommand, ""); +#else + string_set(&sDefault.szLpqcommand, "/usr/bin/lpstat -o%p"); + string_set(&sDefault.szLprmcommand, "/usr/bin/cancel %p-%j"); + string_set(&sDefault.szPrintcommand, "/usr/bin/lp -d%p -oraw %s; rm %s"); + string_set(&sDefault.szQueuepausecommand, "/usr/bin/disable %p"); + string_set(&sDefault.szQueueresumecommand, "/usr/bin/enable %p"); +#endif /* HAVE_LIBCUPS */ break; case PRINT_SYSV: |