From f453117569e04087ae461677717b14cdd65a4cd4 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 5 Sep 2012 15:03:31 +1000 Subject: 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 --- source3/param/loadparm.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'source3/param') 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) -- cgit