Merge changes from CUPS 1.5svn-r9491.

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

diff --git a/systemv/cupsctl.c b/systemv/cupsctl.c
index 7dc3cf3ff3c7e9f89dcda2003c9b3389726184f1..03b4bc05be8b3820d7d2c1e7b2e77e9c4680ac03 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.\n"));
+    return (1);
+  }
+
  /*
   * Connect to the server using the defaults...
   */