/*
- * "$Id$"
+ * "lpadmin" command for CUPS.
*
- * "lpadmin" command for CUPS.
+ * Copyright 2007-2017 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
*
- * Copyright 2007-2011 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
- *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law. Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file. If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- * main() - Parse options and configure the scheduler.
- * add_printer_to_class() - Add a printer to a class.
- * default_printer() - Set the default printing destination.
- * delete_printer() - Delete a printer from the system.
- * delete_printer_from_class() - Delete a printer from a class.
- * delete_printer_option() - Delete a printer option.
- * enable_printer() - Enable a printer.
- * get_printer_type() - Determine the printer type and URI.
- * set_printer_options() - Set the printer options and/or file.
- * validate_name() - Make sure the printer name only contains
- * valid chars.
+ * Licensed under Apache License v2.0. See the file "LICENSE" for more information.
*/
/*
* Include necessary headers...
*/
+#define _CUPS_NO_DEPRECATED
+#define _PPD_DEPRECATED
#include <cups/cups-private.h>
+#include <cups/ppd-private.h>
/*
static int delete_printer_option(http_t *http, char *printer,
char *option);
static int enable_printer(http_t *http, char *printer);
+static char *get_printer_ppd(const char *uri, char *buffer, size_t bufsize);
static cups_ptype_t get_printer_type(http_t *http, char *printer, char *uri,
size_t urisize);
static int set_printer_options(http_t *http, char *printer,
http_t *http; /* Connection to server */
char *printer, /* Destination printer */
*pclass, /* Printer class name */
+ *opt, /* Option pointer */
*val; /* Pointer to allow/deny value */
int num_options; /* Number of options */
cups_option_t *options; /* Options */
- char *file; /* New PPD file/interface script */
+ char *file, /* New PPD file */
+ evefile[1024] = "";
+ /* IPP Everywhere PPD */
+ const char *ppd_name, /* ppd-name value */
+ *device_uri; /* device-uri value */
_cupsSetLocale(argv);
file = NULL;
for (i = 1; i < argc; i ++)
+ {
if (argv[i][0] == '-')
- switch (argv[i][1])
+ {
+ for (opt = argv[i] + 1; *opt; opt ++)
{
- case 'c' : /* Add printer to class */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ switch (*opt)
+ {
+ case 'c' : /* Add printer to class */
+ if (!http)
+ {
+ http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL);
+
+ if (http == NULL)
+ {
+ _cupsLangPrintf(stderr, _("lpadmin: Unable to connect to server: %s"), strerror(errno));
+ return (1);
+ }
+ }
- if (http == NULL)
+ if (printer == NULL)
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s"),
- strerror(errno));
+ _cupsLangPuts(stderr,
+ _("lpadmin: Unable to add a printer to the class:\n"
+ " You must specify a printer name first."));
return (1);
}
- }
-
- if (printer == NULL)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Unable to add a printer to the class:\n"
- " You must specify a printer name "
- "first."));
- return (1);
- }
- if (argv[i][2])
- pclass = argv[i] + 2;
- else
- {
- i ++;
+ if (opt[1] != '\0')
+ {
+ pclass = opt + 1;
+ opt += strlen(opt) - 1;
+ }
+ else
+ {
+ i ++;
- if (i >= argc)
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected class name after \"-c\" option."));
+ return (1);
+ }
+
+ pclass = argv[i];
+ }
+
+ if (!validate_name(pclass))
{
_cupsLangPuts(stderr,
- _("lpadmin: Expected class name after \"-c\" "
- "option."));
+ _("lpadmin: Class name can only contain printable "
+ "characters."));
return (1);
}
- pclass = argv[i];
- }
-
- if (!validate_name(pclass))
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Class name can only contain printable "
- "characters."));
- return (1);
- }
+ if (add_printer_to_class(http, printer, pclass))
+ return (1);
+ break;
- if (add_printer_to_class(http, printer, pclass))
- return (1);
- break;
+ case 'd' : /* Set as default destination */
+ if (!http)
+ {
+ http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL);
- case 'd' : /* Set as default destination */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ if (http == NULL)
+ {
+ _cupsLangPrintf(stderr, _("lpadmin: Unable to connect to server: %s"), strerror(errno));
+ return (1);
+ }
+ }
- if (http == NULL)
+ if (opt[1] != '\0')
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s"),
- strerror(errno));
- return (1);
+ printer = opt + 1;
+ opt += strlen(opt) - 1;
}
- }
+ else
+ {
+ i ++;
- if (argv[i][2])
- printer = argv[i] + 2;
- else
- {
- i ++;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected printer name after \"-d\" option."));
+ return (1);
+ }
- if (i >= argc)
+ printer = argv[i];
+ }
+
+ if (!validate_name(printer))
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected printer name after \"-d\" "
- "option."));
+ _cupsLangPuts(stderr, _("lpadmin: Printer name can only contain printable characters."));
return (1);
}
- printer = argv[i];
- }
+ if (default_printer(http, printer))
+ return (1);
- if (!validate_name(printer))
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Printer name can only contain "
- "printable characters."));
- return (1);
- }
+ i = argc;
+ break;
- if (default_printer(http, printer))
- return (1);
+ case 'h' : /* Connect to host */
+ if (http)
+ {
+ httpClose(http);
+ http = NULL;
+ }
- i = argc;
- break;
+ if (opt[1] != '\0')
+ {
+ cupsSetServer(opt + 1);
+ opt += strlen(opt) - 1;
+ }
+ else
+ {
+ i ++;
- case 'h' : /* Connect to host */
- if (http)
- {
- httpClose(http);
- http = NULL;
- }
-
- if (argv[i][2] != '\0')
- cupsSetServer(argv[i] + 2);
- else
- {
- i ++;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected hostname after \"-h\" option."));
+ return (1);
+ }
- if (i >= argc)
+ cupsSetServer(argv[i]);
+ }
+ break;
+
+ case 'P' : /* Use the specified PPD file */
+ case 'i' : /* Use the specified PPD file */
+ if (opt[1] != '\0')
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected hostname after \"-h\" "
- "option."));
- return (1);
- }
+ file = opt + 1;
+ opt += strlen(opt) - 1;
+ }
+ else
+ {
+ i ++;
- cupsSetServer(argv[i]);
- }
- break;
+ if (i >= argc)
+ {
+ _cupsLangPrintf(stderr, _("lpadmin: Expected PPD after \"-%c\" option."), argv[i - 1][1]);
+ return (1);
+ }
- case 'i' : /* Use the specified interface script */
- if (argv[i][2])
- file = argv[i] + 2;
- else
- {
- i ++;
+ file = argv[i];
+ }
- if (i >= argc)
+ if (*opt == 'i')
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected interface after \"-i\" "
- "option."));
- return (1);
- }
+ /*
+ * Check to see that the specified file is, in fact, a PPD...
+ */
- file = argv[i];
- }
- break;
+ cups_file_t *fp = cupsFileOpen(file, "r");
+ char line[256];
+
+ if (!cupsFileGets(fp, line, sizeof(line)) || strncmp(line, "*PPD-Adobe", 10))
+ {
+ _cupsLangPuts(stderr, _("lpadmin: System V interface scripts are no longer supported for security reasons."));
+ cupsFileClose(fp);
+ return (1);
+ }
+
+ cupsFileClose(fp);
+ }
+ break;
- case 'E' : /* Enable the printer */
- if (printer == NULL)
- {
+ case 'E' : /* Enable the printer/enable encryption */
+ if (printer == NULL)
+ {
#ifdef HAVE_SSL
- cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
+ cupsSetEncryption(HTTP_ENCRYPTION_REQUIRED);
- if (http)
- httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
+ if (http)
+ httpEncryption(http, HTTP_ENCRYPTION_REQUIRED);
#else
- _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support."),
- argv[0]);
+ _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support."), argv[0]);
#endif /* HAVE_SSL */
- break;
- }
-
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ break;
+ }
- if (http == NULL)
+ if (!http)
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s"),
- strerror(errno));
- return (1);
+ http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL);
+
+ if (http == NULL)
+ {
+ _cupsLangPrintf(stderr,
+ _("lpadmin: Unable to connect to server: %s"),
+ strerror(errno));
+ return (1);
+ }
}
- }
- if (enable_printer(http, printer))
- return (1);
- break;
-
- case 'm' : /* Use the specified standard script/PPD file */
- if (argv[i][2])
- num_options = cupsAddOption("ppd-name", argv[i] + 2, num_options,
- &options);
- else
- {
- i ++;
+ if (enable_printer(http, printer))
+ return (1);
+ break;
- if (i >= argc)
+ case 'm' : /* Use the specified standard script/PPD file */
+ if (opt[1] != '\0')
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected model after \"-m\" "
- "option."));
- return (1);
+ num_options = cupsAddOption("ppd-name", opt + 1, num_options, &options);
+ opt += strlen(opt) - 1;
}
+ else
+ {
+ i ++;
- num_options = cupsAddOption("ppd-name", argv[i], num_options,
- &options);
- }
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected model after \"-m\" option."));
+ return (1);
+ }
- case 'o' : /* Set option */
- if (argv[i][2])
- num_options = cupsParseOptions(argv[i] + 2, num_options, &options);
- else
- {
- i ++;
+ num_options = cupsAddOption("ppd-name", argv[i], num_options, &options);
+ }
+ break;
- if (i >= argc)
+ case 'o' : /* Set option */
+ if (opt[1] != '\0')
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected name=value after \"-o\" "
- "option."));
- return (1);
+ num_options = cupsParseOptions(opt + 1, num_options, &options);
+ opt += strlen(opt) - 1;
}
+ else
+ {
+ i ++;
- num_options = cupsParseOptions(argv[i], num_options, &options);
- }
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected name=value after \"-o\" option."));
+ return (1);
+ }
- case 'p' : /* Add/modify a printer */
- if (argv[i][2])
- printer = argv[i] + 2;
- else
- {
- i ++;
+ num_options = cupsParseOptions(argv[i], num_options, &options);
+ }
+ break;
- if (i >= argc)
+ case 'p' : /* Add/modify a printer */
+ if (opt[1] != '\0')
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected printer after \"-p\" "
- "option."));
- return (1);
+ printer = opt + 1;
+ opt += strlen(opt) - 1;
}
+ else
+ {
+ i ++;
- printer = argv[i];
- }
-
- if (!validate_name(printer))
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Printer name can only contain "
- "printable characters."));
- return (1);
- }
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected printer after \"-p\" option."));
+ return (1);
+ }
- case 'r' : /* Remove printer from class */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ printer = argv[i];
+ }
- if (http == NULL)
+ if (!validate_name(printer))
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s"),
- strerror(errno));
+ _cupsLangPuts(stderr, _("lpadmin: Printer name can only contain printable characters."));
return (1);
}
- }
-
- if (printer == NULL)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Unable to remove a printer from the "
- "class:\n"
- " You must specify a printer name "
- "first."));
- return (1);
- }
+ break;
- if (argv[i][2])
- pclass = argv[i] + 2;
- else
- {
- i ++;
+ case 'r' : /* Remove printer from class */
+ if (!http)
+ {
+ http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL);
+
+ if (http == NULL)
+ {
+ _cupsLangPrintf(stderr,
+ _("lpadmin: Unable to connect to server: %s"),
+ strerror(errno));
+ return (1);
+ }
+ }
- if (i >= argc)
+ if (printer == NULL)
{
_cupsLangPuts(stderr,
- _("lpadmin: Expected class after \"-r\" "
- "option."));
+ _("lpadmin: Unable to remove a printer from the class:\n"
+ " You must specify a printer name first."));
return (1);
}
- pclass = argv[i];
- }
-
- if (!validate_name(pclass))
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Class name can only contain printable "
- "characters."));
- return (1);
- }
+ if (opt[1] != '\0')
+ {
+ pclass = opt + 1;
+ opt += strlen(opt) - 1;
+ }
+ else
+ {
+ i ++;
- if (delete_printer_from_class(http, printer, pclass))
- return (1);
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected class after \"-r\" option."));
+ return (1);
+ }
- case 'R' : /* Remove option */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ pclass = argv[i];
+ }
- if (http == NULL)
+ if (!validate_name(pclass))
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s"),
- strerror(errno));
+ _cupsLangPuts(stderr, _("lpadmin: Class name can only contain printable characters."));
return (1);
}
- }
-
- if (printer == NULL)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Unable to delete option:\n"
- " You must specify a printer name "
- "first."));
- return (1);
- }
- if (argv[i][2])
- val = argv[i] + 2;
- else
- {
- i ++;
+ if (delete_printer_from_class(http, printer, pclass))
+ return (1);
+ break;
- if (i >= argc)
+ case 'R' : /* Remove option */
+ if (!http)
+ {
+ http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL);
+
+ if (http == NULL)
+ {
+ _cupsLangPrintf(stderr, _("lpadmin: Unable to connect to server: %s"), strerror(errno));
+ return (1);
+ }
+ }
+
+ if (printer == NULL)
{
_cupsLangPuts(stderr,
- _("lpadmin: Expected name after \"-R\" "
- "option."));
+ _("lpadmin: Unable to delete option:\n"
+ " You must specify a printer name first."));
return (1);
}
- val = argv[i];
- }
-
- if (delete_printer_option(http, printer, val))
- return (1);
- break;
-
- case 'U' : /* Username */
- if (argv[i][2] != '\0')
- cupsSetUser(argv[i] + 2);
- else
- {
- i ++;
- if (i >= argc)
+ if (opt[1] != '\0')
{
- _cupsLangPrintf(stderr,
- _("%s: Error - expected username after "
- "\"-U\" option."), argv[0]);
- return (1);
+ val = opt + 1;
+ opt += strlen(opt) - 1;
}
+ else
+ {
+ i ++;
- cupsSetUser(argv[i]);
- }
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected name after \"-R\" option."));
+ return (1);
+ }
- case 'u' : /* Allow/deny users */
- if (argv[i][2])
- val = argv[i] + 2;
- else
- {
- i ++;
-
- if (i >= argc)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Expected allow/deny:userlist after "
- "\"-u\" option."));
- return (1);
+ val = argv[i];
}
- val = argv[i];
- }
-
- if (!_cups_strncasecmp(val, "allow:", 6))
- num_options = cupsAddOption("requesting-user-name-allowed",
- val + 6, num_options, &options);
- else if (!_cups_strncasecmp(val, "deny:", 5))
- num_options = cupsAddOption("requesting-user-name-denied",
- val + 5, num_options, &options);
- else
- {
- _cupsLangPrintf(stderr,
- _("lpadmin: Unknown allow/deny option \"%s\"."),
- val);
- return (1);
- }
- break;
+ if (delete_printer_option(http, printer, val))
+ return (1);
+ break;
- case 'v' : /* Set the device-uri attribute */
- if (argv[i][2])
- num_options = cupsAddOption("device-uri", argv[i] + 2,
- num_options, &options);
- else
- {
- i ++;
+ case 'U' : /* Username */
+ if (opt[1] != '\0')
+ {
+ cupsSetUser(opt + 1);
+ opt += strlen(opt) - 1;
+ }
+ else
+ {
+ i ++;
+ if (i >= argc)
+ {
+ _cupsLangPrintf(stderr, _("%s: Error - expected username after \"-U\" option."), argv[0]);
+ return (1);
+ }
+
+ cupsSetUser(argv[i]);
+ }
+ break;
- if (i >= argc)
+ case 'u' : /* Allow/deny users */
+ if (opt[1] != '\0')
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected device URI after \"-v\" "
- "option."));
- return (1);
+ val = opt + 1;
+ opt += strlen(opt) - 1;
}
+ else
+ {
+ i ++;
- num_options = cupsAddOption("device-uri", argv[i],
- num_options, &options);
- }
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected allow/deny:userlist after \"-u\" option."));
+ return (1);
+ }
- case 'x' : /* Delete a printer */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ val = argv[i];
+ }
- if (http == NULL)
+ if (!_cups_strncasecmp(val, "allow:", 6))
+ num_options = cupsAddOption("requesting-user-name-allowed", val + 6, num_options, &options);
+ else if (!_cups_strncasecmp(val, "deny:", 5))
+ num_options = cupsAddOption("requesting-user-name-denied", val + 5, num_options, &options);
+ else
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s"),
- strerror(errno));
+ _cupsLangPrintf(stderr, _("lpadmin: Unknown allow/deny option \"%s\"."), val);
return (1);
}
- }
-
- if (argv[i][2])
- printer = argv[i] + 2;
- else
- {
- i ++;
+ break;
- if (i >= argc)
+ case 'v' : /* Set the device-uri attribute */
+ if (opt[1] != '\0')
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected printer or class after "
- "\"-x\" option."));
- return (1);
+ num_options = cupsAddOption("device-uri", opt + 1, num_options, &options);
+ opt += strlen(opt) - 1;
}
+ else
+ {
+ i ++;
- printer = argv[i];
- }
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected device URI after \"-v\" option."));
+ return (1);
+ }
- if (!validate_name(printer))
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Printer name can only contain "
- "printable characters."));
- return (1);
- }
+ num_options = cupsAddOption("device-uri", argv[i], num_options, &options);
+ }
+ break;
- if (delete_printer(http, printer))
- return (1);
+ case 'x' : /* Delete a printer */
+ if (!http)
+ {
+ http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL);
+
+ if (http == NULL)
+ {
+ _cupsLangPrintf(stderr,
+ _("lpadmin: Unable to connect to server: %s"),
+ strerror(errno));
+ return (1);
+ }
+ }
- i = argc;
- break;
+ if (opt[1] != '\0')
+ {
+ printer = opt + 1;
+ opt += strlen(opt) - 1;
+ }
+ else
+ {
+ i ++;
- case 'D' : /* Set the printer-info attribute */
- if (argv[i][2])
- num_options = cupsAddOption("printer-info", argv[i] + 2,
- num_options, &options);
- else
- {
- i ++;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected printer or class after \"-x\" option."));
+ return (1);
+ }
- if (i >= argc)
+ printer = argv[i];
+ }
+
+ if (!validate_name(printer))
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected description after "
- "\"-D\" option."));
+ _cupsLangPuts(stderr, _("lpadmin: Printer name can only contain printable characters."));
return (1);
}
- num_options = cupsAddOption("printer-info", argv[i],
- num_options, &options);
- }
- break;
+ if (delete_printer(http, printer))
+ return (1);
- case 'I' : /* Set the supported file types (ignored) */
- i ++;
+ i = argc;
+ break;
- if (i >= argc)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Expected file type(s) after \"-I\" "
- "option."));
- return (1);
- }
+ case 'D' : /* Set the printer-info attribute */
+ if (opt[1] != '\0')
+ {
+ num_options = cupsAddOption("printer-info", opt + 1, num_options, &options);
+ opt += strlen(opt) - 1;
+ }
+ else
+ {
+ i ++;
- _cupsLangPuts(stderr,
- _("lpadmin: Warning - content type list ignored."));
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected description after \"-D\" option."));
+ return (1);
+ }
- case 'L' : /* Set the printer-location attribute */
- if (argv[i][2])
- num_options = cupsAddOption("printer-location", argv[i] + 2,
- num_options, &options);
- else
- {
+ num_options = cupsAddOption("printer-info", argv[i], num_options, &options);
+ }
+ break;
+
+ case 'I' : /* Set the supported file types (ignored) */
i ++;
if (i >= argc)
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected location after \"-L\" "
- "option."));
+ _cupsLangPuts(stderr, _("lpadmin: Expected file type(s) after \"-I\" option."));
return (1);
}
- num_options = cupsAddOption("printer-location", argv[i],
- num_options, &options);
- }
- break;
-
- case 'P' : /* Use the specified PPD file */
- if (argv[i][2])
- file = argv[i] + 2;
- else
- {
- i ++;
+ _cupsLangPuts(stderr, _("lpadmin: Warning - content type list ignored."));
+ break;
- if (i >= argc)
+ case 'L' : /* Set the printer-location attribute */
+ if (opt[1] != '\0')
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected PPD after \"-P\" option."));
- return (1);
+ num_options = cupsAddOption("printer-location", opt + 1, num_options, &options);
+ opt += strlen(opt) - 1;
}
+ else
+ {
+ i ++;
- file = argv[i];
- }
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected location after \"-L\" option."));
+ return (1);
+ }
- default :
- _cupsLangPrintf(stderr,
- _("lpadmin: Unknown option \"%c\"."), argv[i][1]);
- return (1);
+ num_options = cupsAddOption("printer-location", argv[i], num_options, &options);
+ }
+ break;
+
+ default :
+ _cupsLangPrintf(stderr, _("lpadmin: Unknown option \"%c\"."), *opt);
+ return (1);
+ }
}
+ }
else
{
- _cupsLangPrintf(stderr, _("lpadmin: Unknown argument \"%s\"."),
- argv[i]);
+ _cupsLangPrintf(stderr, _("lpadmin: Unknown argument \"%s\"."), argv[i]);
return (1);
}
+ }
/*
* Set options as needed...
*/
- if (num_options || file)
+ if ((ppd_name = cupsGetOption("ppd-name", num_options, options)) != NULL && !strcmp(ppd_name, "everywhere") && (device_uri = cupsGetOption("device-uri", num_options, options)) != NULL)
{
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());
+ if ((file = get_printer_ppd(device_uri, evefile, sizeof(evefile))) == NULL)
+ return (1);
- if (http == NULL)
- {
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s"),
- strerror(errno));
- return (1);
- }
- }
+ num_options = cupsRemoveOption("ppd-name", num_options, &options);
+ }
+ if (num_options || file)
+ {
if (printer == NULL)
{
_cupsLangPuts(stderr,
_("lpadmin: Unable to set the printer options:\n"
- " You must specify a printer name first."));
+ " You must specify a printer name first."));
return (1);
}
+ if (!http)
+ {
+ http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC,
+ cupsEncryption(), 1, 30000, NULL);
+
+ if (http == NULL) {
+ _cupsLangPrintf(stderr, _("lpadmin: Unable to connect to server: %s"),
+ strerror(errno));
+ return (1);
+ }
+ }
+
if (set_printer_options(http, printer, num_options, options, file))
return (1);
}
+ if (evefile[0])
+ unlink(evefile);
+
if (printer == NULL)
{
_cupsLangPuts(stdout,
printer, pclass));
/*
- * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
+ * Build an IPP_OP_GET_PRINTER_ATTRIBUTES request, which requires the following
* attributes:
*
* attributes-charset
* requesting-user-name
*/
- request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
+ request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
"localhost", 0, "/classes/%s", pclass);
response = cupsDoRequest(http, request, "/");
/*
- * Build a CUPS_ADD_MODIFY_CLASS request, which requires the following
+ * Build a CUPS-Add-Modify-Class request, which requires the following
* attributes:
*
* attributes-charset
* member-uris
*/
- request = ippNewRequest(CUPS_ADD_MODIFY_CLASS);
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_CLASS);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
ippDelete(response);
ippDelete(cupsDoRequest(http, request, "/admin/"));
- if (cupsLastError() > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
_cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
DEBUG_printf(("default_printer(%p, \"%s\")\n", http, printer));
/*
- * Build a CUPS_SET_DEFAULT request, which requires the following
+ * Build a CUPS-Set-Default request, which requires the following
* attributes:
*
* attributes-charset
httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
"localhost", 0, "/printers/%s", printer);
- request = ippNewRequest(CUPS_SET_DEFAULT);
+ request = ippNewRequest(IPP_OP_CUPS_SET_DEFAULT);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
ippDelete(cupsDoRequest(http, request, "/admin/"));
- if (cupsLastError() > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
_cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
DEBUG_printf(("delete_printer(%p, \"%s\")\n", http, printer));
/*
- * Build a CUPS_DELETE_PRINTER request, which requires the following
+ * Build a CUPS-Delete-Printer request, which requires the following
* attributes:
*
* attributes-charset
* requesting-user-name
*/
- request = ippNewRequest(CUPS_DELETE_PRINTER);
+ request = ippNewRequest(IPP_OP_CUPS_DELETE_PRINTER);
httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
"localhost", 0, "/printers/%s", printer);
ippDelete(cupsDoRequest(http, request, "/admin/"));
- if (cupsLastError() > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
_cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
printer, pclass));
/*
- * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
+ * Build an IPP_OP_GET_PRINTER_ATTRIBUTES request, which requires the following
* attributes:
*
* attributes-charset
* requesting-user-name
*/
- request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
+ request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
"localhost", 0, "/classes/%s", pclass);
*/
if ((response = cupsDoRequest(http, request, "/classes/")) == NULL ||
- response->request.status.status_code == IPP_NOT_FOUND)
+ response->request.status.status_code == IPP_STATUS_ERROR_NOT_FOUND)
{
_cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
if (members->num_values == 1)
{
/*
- * Build a CUPS_DELETE_CLASS request, which requires the following
+ * Build a CUPS-Delete-Class request, which requires the following
* attributes:
*
* attributes-charset
* requesting-user-name
*/
- request = ippNewRequest(CUPS_DELETE_CLASS);
+ request = ippNewRequest(IPP_OP_CUPS_DELETE_CLASS);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
else
{
/*
- * Build a CUPS_ADD_MODIFY_CLASS request, which requires the following
+ * Build a IPP_OP_CUPS_ADD_MODIFY_CLASS request, which requires the following
* attributes:
*
* attributes-charset
* member-uris
*/
- request = ippNewRequest(CUPS_ADD_MODIFY_CLASS);
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_CLASS);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
ippDelete(cupsDoRequest(http, request, "/admin/"));
- if (cupsLastError() > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
_cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
/*
- * Build a CUPS_ADD_MODIFY_PRINTER or CUPS_ADD_MODIFY_CLASS request, which
+ * Build a IPP_OP_CUPS_ADD_MODIFY_PRINTER or IPP_OP_CUPS_ADD_MODIFY_CLASS request, which
* requires the following attributes:
*
* attributes-charset
*/
if (get_printer_type(http, printer, uri, sizeof(uri)) & CUPS_PRINTER_CLASS)
- request = ippNewRequest(CUPS_ADD_MODIFY_CLASS);
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_CLASS);
else
- request = ippNewRequest(CUPS_ADD_MODIFY_PRINTER);
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_PRINTER);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
ippDelete(cupsDoRequest(http, request, "/admin/"));
- if (cupsLastError() > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
_cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
DEBUG_printf(("enable_printer(%p, \"%s\")\n", http, printer));
/*
- * Build a CUPS_ADD_MODIFY_PRINTER or CUPS_ADD_MODIFY_CLASS request, which
+ * Build a IPP_OP_CUPS_ADD_MODIFY_PRINTER or IPP_OP_CUPS_ADD_MODIFY_CLASS request, which
* require the following attributes:
*
* attributes-charset
*/
if (get_printer_type(http, printer, uri, sizeof(uri)) & CUPS_PRINTER_CLASS)
- request = ippNewRequest(CUPS_ADD_MODIFY_CLASS);
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_CLASS);
else
- request = ippNewRequest(CUPS_ADD_MODIFY_PRINTER);
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_PRINTER);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
"requesting-user-name", NULL, cupsUser());
ippAddInteger(request, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state",
- IPP_PRINTER_IDLE);
+ IPP_PSTATE_IDLE);
ippAddBoolean(request, IPP_TAG_PRINTER, "printer-is-accepting-jobs", 1);
/*
ippDelete(cupsDoRequest(http, request, "/admin/"));
- if (cupsLastError() > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
_cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
}
+/*
+ * 'get_printer_ppd()' - Get an IPP Everywhere PPD file for the given URI.
+ */
+
+static char * /* O - Filename or NULL */
+get_printer_ppd(const char *uri, /* I - Printer URI */
+ char *buffer, /* I - Filename buffer */
+ size_t bufsize) /* I - Size of filename buffer */
+{
+ http_t *http; /* Connection to printer */
+ ipp_t *request, /* Get-Printer-Attributes request */
+ *response; /* Get-Printer-Attributes response */
+ char resolved[1024], /* Resolved URI */
+ scheme[32], /* URI scheme */
+ userpass[256], /* Username:password */
+ host[256], /* Hostname */
+ resource[256]; /* Resource path */
+ int port; /* Port number */
+
+
+ /*
+ * Connect to the printer...
+ */
+
+ if (strstr(uri, "._tcp"))
+ {
+ /*
+ * Resolve URI...
+ */
+
+ if (!_httpResolveURI(uri, resolved, sizeof(resolved), _HTTP_RESOLVE_DEFAULT, NULL, NULL))
+ {
+ _cupsLangPrintf(stderr, _("%s: Unable to resolve \"%s\"."), "lpadmin", uri);
+ return (NULL);
+ }
+
+ uri = resolved;
+ }
+
+ if (httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme), userpass, sizeof(userpass), host, sizeof(host), &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK)
+ {
+ _cupsLangPrintf(stderr, _("%s: Bad printer URI \"%s\"."), "lpadmin", uri);
+ return (NULL);
+ }
+
+ http = httpConnect2(host, port, NULL, AF_UNSPEC, !strcmp(scheme, "ipps") ? HTTP_ENCRYPTION_ALWAYS : HTTP_ENCRYPTION_IF_REQUESTED, 1, 30000, NULL);
+ if (!http)
+ {
+ _cupsLangPrintf(stderr, _("%s: Unable to connect to \"%s:%d\": %s"), "lpadmin", host, port, cupsLastErrorString());
+ return (NULL);
+ }
+
+ /*
+ * Send a Get-Printer-Attributes request...
+ */
+
+ request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
+ response = cupsDoRequest(http, request, resource);
+
+ if (!_ppdCreateFromIPP(buffer, bufsize, response))
+ _cupsLangPrintf(stderr, _("%s: Unable to create PPD file: %s"), "lpadmin", strerror(errno));
+
+ ippDelete(response);
+ httpClose(http);
+
+ if (buffer[0])
+ return (buffer);
+ else
+ return (NULL);
+}
+
+
/*
* 'get_printer_type()' - Determine the printer type and URI.
*/
* requesting-user-name
*/
- httpAssembleURIf(HTTP_URI_CODING_ALL, uri, urisize, "ipp", NULL, "localhost",
- ippPort(), "/printers/%s", printer);
+ httpAssembleURIf(HTTP_URI_CODING_ALL, uri, (int)urisize, "ipp", NULL, "localhost", ippPort(), "/printers/%s", printer);
- request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
+ request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
type = (cups_ptype_t)attr->values[0].integer;
if (type & CUPS_PRINTER_CLASS)
- httpAssembleURIf(HTTP_URI_CODING_ALL, uri, urisize, "ipp", NULL,
- "localhost", ippPort(), "/classes/%s", printer);
+ httpAssembleURIf(HTTP_URI_CODING_ALL, uri, (int)urisize, "ipp", NULL, "localhost", ippPort(), "/classes/%s", printer);
}
else
type = CUPS_PRINTER_LOCAL;
{
ipp_t *request; /* IPP Request */
const char *ppdfile; /* PPD filename */
- int ppdchanged; /* PPD changed? */
+ int ppdchanged = 0; /* PPD changed? */
ppd_file_t *ppd; /* PPD file */
ppd_choice_t *choice; /* Marked choice */
char uri[HTTP_MAX_URI], /* URI for printer/class */
tempfile[1024]; /* Temporary filename */
cups_file_t *in, /* PPD file */
*out; /* Temporary file */
- const char *protocol, /* Old protocol option */
+ const char *ppdname, /* ppd-name value */
+ *protocol, /* Old protocol option */
*customval, /* Custom option value */
*boolval; /* Boolean value */
int wrote_ipp_supplies = 0, /* Wrote cupsIPPSupplies keyword? */
- wrote_snmp_supplies = 0;/* Wrote cupsSNMPSupplies keyword? */
+ wrote_snmp_supplies = 0,/* Wrote cupsSNMPSupplies keyword? */
+ copied_options = 0; /* Copied options? */
DEBUG_printf(("set_printer_options(http=%p, printer=\"%s\", num_options=%d, "
options, file));
/*
- * Build a CUPS_ADD_MODIFY_PRINTER or CUPS_ADD_MODIFY_CLASS request, which
- * requires the following attributes:
+ * Build a CUPS-Add-Modify-Printer or CUPS-Add-Modify-Class request,
+ * which requires the following attributes:
*
* attributes-charset
* attributes-natural-language
*/
if (get_printer_type(http, printer, uri, sizeof(uri)) & CUPS_PRINTER_CLASS)
- request = ippNewRequest(CUPS_ADD_MODIFY_CLASS);
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_CLASS);
else
- request = ippNewRequest(CUPS_ADD_MODIFY_PRINTER);
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_PRINTER);
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
- "printer-uri", NULL, uri);
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
- "requesting-user-name", NULL, cupsUser());
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, cupsUser());
/*
* Add the options...
*/
+ if (file)
+ ppdfile = file;
+ else if ((ppdname = cupsGetOption("ppd-name", num_options, options)) != NULL && strcmp(ppdname, "raw") && num_options > 1)
+ {
+ if ((ppdfile = cupsGetServerPPD(http, ppdname)) != NULL)
+ {
+ /*
+ * Copy options array and remove ppd-name from it...
+ */
+
+ cups_option_t *temp = NULL, *optr;
+ int i, num_temp = 0;
+ for (i = num_options, optr = options; i > 0; i --, optr ++)
+ if (strcmp(optr->name, "ppd-name"))
+ num_temp = cupsAddOption(optr->name, optr->value, num_temp, &temp);
+
+ copied_options = 1;
+ ppdchanged = 1;
+ num_options = num_temp;
+ options = temp;
+ }
+ }
+ else if (request->request.op.operation_id == IPP_OP_CUPS_ADD_MODIFY_PRINTER)
+ ppdfile = cupsGetPPD(printer);
+ else
+ ppdfile = NULL;
+
+ cupsEncodeOptions2(request, num_options, options, IPP_TAG_OPERATION);
cupsEncodeOptions2(request, num_options, options, IPP_TAG_PRINTER);
if ((protocol = cupsGetOption("protocol", num_options, options)) != NULL)
NULL, "tbcp");
}
- if (file)
- ppdfile = file;
- else if (request->request.op.operation_id == CUPS_ADD_MODIFY_PRINTER)
- ppdfile = cupsGetPPD(printer);
- else
- ppdfile = NULL;
-
- if (ppdfile != NULL)
+ if (ppdfile)
{
/*
* Set default options in the PPD file...
*/
- ppd = ppdOpenFile(ppdfile);
+ if ((ppd = ppdOpenFile(ppdfile)) == NULL)
+ {
+ int linenum; /* Line number of error */
+ ppd_status_t status = ppdLastError(&linenum);
+ /* Status code */
+
+ _cupsLangPrintf(stderr, _("lpadmin: Unable to open PPD \"%s\": %s on line %d."), ppdfile, ppdErrorString(status), linenum);
+ }
+
ppdMarkDefaults(ppd);
cupsMarkOptions(ppd, num_options, options);
ippDelete(request);
if (ppdfile != file)
unlink(ppdfile);
+ if (copied_options)
+ cupsFreeOptions(num_options, options);
return (1);
}
ippDelete(request);
if (ppdfile != file)
unlink(ppdfile);
+ if (copied_options)
+ cupsFreeOptions(num_options, options);
cupsFileClose(out);
unlink(tempfile);
return (1);
}
- ppdchanged = 0;
-
while (cupsFileGets(in, line, sizeof(line)))
{
if (!strncmp(line, "*cupsIPPSupplies:", 17) &&
ippDelete(cupsDoRequest(http, request, "/admin/"));
}
+ if (copied_options)
+ cupsFreeOptions(num_options, options);
+
/*
* Check the response...
*/
- if (cupsLastError() > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
_cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
for (ptr = name; *ptr; ptr ++)
if (*ptr == '@')
break;
- else if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' ||
- *ptr == '#')
+ else if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' || *ptr == '\\' || *ptr == '?' || *ptr == '\'' || *ptr == '\"' || *ptr == '#')
return (0);
/*
return ((ptr - name) < 128);
}
-
-
-/*
- * End of "$Id$".
- */
projects / thirdparty / cups.git / blobdiff