diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-11-08 00:30:03 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-11-08 00:30:03 +0000 |
| commit | a2326b5b72c5117a00d4342dde8e4d20ff41defe (patch) | |
| tree | ecd2d60a15f7bad184a6f6e7c20f846e8a4cfadf /systemv | |
| parent | d7225fc298cb8397b85758198e70fc5399a44720 (diff) | |
| download | cups-a2326b5b72c5117a00d4342dde8e4d20ff41defe.tar.gz | |
Merge changes from CUPS 1.6svn-r10112.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3486 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'systemv')
| -rw-r--r-- | systemv/cupsctl.c | 8 | ||||
| -rw-r--r-- | systemv/lpadmin.c | 11 | ||||
| -rw-r--r-- | systemv/lpstat.c | 3 |
3 files changed, 7 insertions, 15 deletions
diff --git a/systemv/cupsctl.c b/systemv/cupsctl.c index e53a71477..e65a4f77b 100644 --- a/systemv/cupsctl.c +++ b/systemv/cupsctl.c @@ -83,12 +83,6 @@ main(int argc, /* I - Number of command-line args */ else if (!strcmp(argv[i], "--no-remote-any")) num_settings = cupsAddOption(CUPS_SERVER_REMOTE_ANY, "0", num_settings, &settings); - else if (!strcmp(argv[i], "--remote-printers")) - num_settings = cupsAddOption(CUPS_SERVER_REMOTE_PRINTERS, "1", - num_settings, &settings); - else if (!strcmp(argv[i], "--no-remote-printers")) - num_settings = cupsAddOption(CUPS_SERVER_REMOTE_PRINTERS, "0", - num_settings, &settings); else if (!strcmp(argv[i], "--share-printers")) num_settings = cupsAddOption(CUPS_SERVER_SHARE_PRINTERS, "1", num_settings, &settings); @@ -219,8 +213,6 @@ usage(const char *opt) /* I - Option character/string */ "administration on/off.")); _cupsLangPuts(stdout, _(" --[no-]remote-any Allow/prevent access " "from the Internet.")); - _cupsLangPuts(stdout, _(" --[no-]remote-printers Show/hide remote " - "printers.")); _cupsLangPuts(stdout, _(" --[no-]share-printers Turn printer sharing " "on/off.")); _cupsLangPuts(stdout, _(" --[no-]user-cancel-any Allow/prevent users to " diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c index 64c3f84e9..5fe0b9bbc 100644 --- a/systemv/lpadmin.c +++ b/systemv/lpadmin.c @@ -1090,8 +1090,7 @@ delete_printer_option(http_t *http, /* I - Server connection */ * option with deleteAttr tag */ - if (get_printer_type(http, printer, uri, sizeof(uri)) & - (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT)) + if (get_printer_type(http, printer, uri, sizeof(uri)) & CUPS_PRINTER_CLASS) request = ippNewRequest(CUPS_ADD_MODIFY_CLASS); else request = ippNewRequest(CUPS_ADD_MODIFY_PRINTER); @@ -1145,8 +1144,7 @@ enable_printer(http_t *http, /* I - Server connection */ * printer-is-accepting-jobs */ - if (get_printer_type(http, printer, uri, sizeof(uri)) & - (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT)) + if (get_printer_type(http, printer, uri, sizeof(uri)) & CUPS_PRINTER_CLASS) request = ippNewRequest(CUPS_ADD_MODIFY_CLASS); else request = ippNewRequest(CUPS_ADD_MODIFY_PRINTER); @@ -1224,7 +1222,7 @@ get_printer_type(http_t *http, /* I - Server connection */ { type = (cups_ptype_t)attr->values[0].integer; - if (type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT)) + if (type & CUPS_PRINTER_CLASS) httpAssembleURIf(HTTP_URI_CODING_ALL, uri, urisize, "ipp", NULL, "localhost", ippPort(), "/classes/%s", printer); } @@ -1283,8 +1281,7 @@ set_printer_options( * other options */ - if (get_printer_type(http, printer, uri, sizeof(uri)) & - (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT)) + if (get_printer_type(http, printer, uri, sizeof(uri)) & CUPS_PRINTER_CLASS) request = ippNewRequest(CUPS_ADD_MODIFY_CLASS); else request = ippNewRequest(CUPS_ADD_MODIFY_PRINTER); diff --git a/systemv/lpstat.c b/systemv/lpstat.c index eae93bba0..20ef8bf00 100644 --- a/systemv/lpstat.c +++ b/systemv/lpstat.c @@ -580,6 +580,9 @@ match_list(const char *list, /* I - List of names */ if (!list || !*list) return (1); + if (!name) + return (0); + while (*list) { /* |