License change: Apache License, Version 2.0.

[thirdparty/cups.git] / systemv / cupsctl.c

diff --git a/systemv/cupsctl.c b/systemv/cupsctl.c
index eabc6e479ef6011d16a039d1c83a5412de6d4356..eedd01344e5e7815ba5ec1489b00b0e6e2612193 100644 (file)
--- a/systemv/cupsctl.c
+++ b/systemv/cupsctl.c
@@ -1,23 +1,10 @@
 /*
- * "$Id$"
+ * Scheduler control program for CUPS.
  *
- *   Scheduler control program for CUPS.
+ * Copyright 2007-2012 by Apple Inc.
+ * Copyright 2006-2007 by Easy Software Products.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 2006-2007 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/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main()  - Get/set server settings.
- *   usage() - Show program usage.
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
  */
 
 /*
@@ -32,7 +19,7 @@
  * Local functions...
  */
 
-static void    usage(const char *opt);
+static void    usage(const char *opt) __attribute__((noreturn));
 
 
 /*
@@ -83,12 +70,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);
@@ -208,7 +189,7 @@ usage(const char *opt)                      /* I - Option character/string */
   _cupsLangPuts(stdout, "");
   _cupsLangPuts(stdout, _("Options:"));
   _cupsLangPuts(stdout, "");
-  _cupsLangPuts(stdout, _("  -E                      Enable encryption."));
+  _cupsLangPuts(stdout, _("  -E                      Encrypt the connection."));
   _cupsLangPuts(stdout, _("  -U username             Specify username."));
   _cupsLangPuts(stdout, _("  -h server[:port]        Specify server "
                           "address."));
@@ -219,8 +200,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 "
@@ -228,8 +207,3 @@ usage(const char *opt)                      /* I - Option character/string */
 
   exit(1);
 }
-
-
-/*
- * End of "$Id$".
- */