diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-09-05 15:03:31 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-09-06 11:16:11 +1000 |
| commit | f453117569e04087ae461677717b14cdd65a4cd4 (patch) | |
| tree | 65fcd1816e2edb947fa736752ed237e04b65af34 /source3 | |
| parent | e00ac55994ad7d067f7f628ae4157f0d23f819c4 (diff) | |
| download | samba-f453117569e04087ae461677717b14cdd65a4cd4.tar.gz samba-f453117569e04087ae461677717b14cdd65a4cd4.tar.bz2 samba-f453117569e04087ae461677717b14cdd65a4cd4.zip | |
s3-printing: Restrict printing=cups to systems with cups development headers at build time
This means that instead of failing due to the default commandline values not being quite correct
that we clearly fail at loadparm and testparm time when parsing the printing= line.
Andrew Bartlett
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 14 | ||||
| -rw-r--r-- | source3/utils/testparm.c | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 1e418258d4..2c77691373 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -408,7 +408,6 @@ static void init_printer_values(struct loadparm_service *pService) case PRINT_CUPS: case PRINT_IPRINT: -#ifdef HAVE_CUPS /* set the lpq command to contain the destination printer name only. This is used by cups_queue_get() */ string_set(&pService->szLpqcommand, "%p"); @@ -418,15 +417,6 @@ static void init_printer_values(struct loadparm_service *pService) string_set(&pService->szLpresumecommand, ""); string_set(&pService->szQueuepausecommand, ""); string_set(&pService->szQueueresumecommand, ""); -#else - string_set(&pService->szLpqcommand, "lpq -P'%p'"); - string_set(&pService->szLprmcommand, "lprm -P'%p' %j"); - string_set(&pService->szPrintcommand, "lpr -P'%p' %s; rm %s"); - string_set(&pService->szLppausecommand, "lp -i '%p-%j' -H hold"); - string_set(&pService->szLpresumecommand, "lp -i '%p-%j' -H resume"); - string_set(&pService->szQueuepausecommand, "disable '%p'"); - string_set(&pService->szQueueresumecommand, "enable '%p'"); -#endif /* HAVE_CUPS */ break; case PRINT_SYSV: @@ -5284,11 +5274,7 @@ const char *lp_printcapname(void) return Globals.szPrintcapname; if (sDefault.iPrinting == PRINT_CUPS) { -#ifdef HAVE_CUPS return "cups"; -#else - return "lpstat"; -#endif } if (sDefault.iPrinting == PRINT_BSD) diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index 105f1c5746..a9793ab4cd 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -333,13 +333,11 @@ static void do_per_share_checks(int s) "%s. Map system can only work if force create mode " "excludes octal 010 (S_IXGRP).\n", lp_servicename(talloc_tos(), s)); } -#ifdef HAVE_CUPS if (lp_printing(s) == PRINT_CUPS && *(lp_printcommand(talloc_tos(), s)) != '\0') { fprintf(stderr,"Warning: Service %s defines a print command, but \ rameter is ignored when using CUPS libraries.\n", lp_servicename(talloc_tos(), s) ); } -#endif } int main(int argc, const char *argv[]) |