diff options
| author | Michael R Sweet <msweet@msweet.org> | 2021-07-16 07:27:42 -0400 |
|---|---|---|
| committer | Michael R Sweet <msweet@msweet.org> | 2021-07-16 07:27:42 -0400 |
| commit | 5708fbb59c7f43277dffe12c283854cd565d7113 (patch) | |
| tree | af181b5ff27bc1dd31eea3436a2083e213233daa | |
| parent | 11055349c31a52ffb2ced2eaa5faad7fb9749478 (diff) | |
| download | cups-5708fbb59c7f43277dffe12c283854cd565d7113.tar.gz | |
Mirror IPP Everywhere "everywhere" model fix from OpenPrinting CUPS.
| -rw-r--r-- | systemv/lpadmin.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c index 8fb014242..dc875cb8c 100644 --- a/systemv/lpadmin.c +++ b/systemv/lpadmin.c @@ -1,6 +1,7 @@ /* * "lpadmin" command for CUPS. * + * Copyright © 2021 by OpenPrinting. * Copyright © 2007-2021 by Apple Inc. * Copyright © 1997-2006 by Easy Software Products. * @@ -239,14 +240,14 @@ main(int argc, /* I - Number of command-line arguments */ case 'E' : /* Enable the printer/enable encryption */ if (printer == NULL) { -#ifdef HAVE_SSL +#ifdef HAVE_TLS cupsSetEncryption(HTTP_ENCRYPTION_REQUIRED); if (http) httpEncryption(http, HTTP_ENCRYPTION_REQUIRED); #else _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support."), argv[0]); -#endif /* HAVE_SSL */ +#endif /* HAVE_TLS */ break; } @@ -1266,7 +1267,7 @@ set_printer_options( if (file) ppdfile = file; - else if ((ppdname = cupsGetOption("ppd-name", num_options, options)) != NULL && strcmp(ppdname, "raw") && num_options > 1) + else if ((ppdname = cupsGetOption("ppd-name", num_options, options)) != NULL && strcmp(ppdname, "everywhere") && strcmp(ppdname, "raw") && num_options > 1) { if ((ppdfile = cupsGetServerPPD(http, ppdname)) != NULL) { |