Merge changes from CUPS 1.5svn-r9641

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

diff --git a/systemv/cupsctl.c b/systemv/cupsctl.c
index 7dc3cf3ff3c7e9f89dcda2003c9b3389726184f1..eabc6e479ef6011d16a039d1c83a5412de6d4356 100644 (file)
--- a/systemv/cupsctl.c
+++ b/systemv/cupsctl.c
@@ -3,7 +3,7 @@
  *
  *   Scheduler control program for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -141,6 +141,13 @@ main(int  argc,                            /* I - Number of command-line args */
       usage(argv[i]);
   }
 
+  if (cupsGetOption("Listen", num_settings, settings) ||
+      cupsGetOption("Port", num_settings, settings))
+  {
+    _cupsLangPuts(stderr, _("cupsctl: Cannot set Listen or Port directly."));
+    return (1);
+  }
+
  /*
   * Connect to the server using the defaults...
   */
@@ -201,22 +208,22 @@ usage(const char *opt)                    /* I - Option character/string */
   _cupsLangPuts(stdout, "");
   _cupsLangPuts(stdout, _("Options:"));
   _cupsLangPuts(stdout, "");
-  _cupsLangPuts(stdout, _("    -E                      Enable encryption."));
-  _cupsLangPuts(stdout, _("    -U username             Specify username."));
-  _cupsLangPuts(stdout, _("    -h server[:port]        Specify server "
+  _cupsLangPuts(stdout, _("  -E                      Enable encryption."));
+  _cupsLangPuts(stdout, _("  -U username             Specify username."));
+  _cupsLangPuts(stdout, _("  -h server[:port]        Specify server "
                           "address."));
   _cupsLangPuts(stdout, "");
-  _cupsLangPuts(stdout, _("    --[no-]debug-logging    Turn debug logging "
+  _cupsLangPuts(stdout, _("  --[no-]debug-logging    Turn debug logging "
                           "on/off."));
-  _cupsLangPuts(stdout, _("    --[no-]remote-admin     Turn remote "
+  _cupsLangPuts(stdout, _("  --[no-]remote-admin     Turn remote "
                           "administration on/off."));
-  _cupsLangPuts(stdout, _("    --[no-]remote-any       Allow/prevent access "
+  _cupsLangPuts(stdout, _("  --[no-]remote-any       Allow/prevent access "
                           "from the Internet."));
-  _cupsLangPuts(stdout, _("    --[no-]remote-printers  Show/hide remote "
+  _cupsLangPuts(stdout, _("  --[no-]remote-printers  Show/hide remote "
                           "printers."));
-  _cupsLangPuts(stdout, _("    --[no-]share-printers   Turn printer sharing "
+  _cupsLangPuts(stdout, _("  --[no-]share-printers   Turn printer sharing "
                           "on/off."));
-  _cupsLangPuts(stdout, _("    --[no-]user-cancel-any  Allow/prevent users to "
+  _cupsLangPuts(stdout, _("  --[no-]user-cancel-any  Allow/prevent users to "
                           "cancel any job."));
 
   exit(1);