Load cups into easysw/current.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@342 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 14 insertions, 17 deletions

diff --git a/backend/snmp.c b/backend/snmp.c
index bcacf14c1..916430bd8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -1,25 +1,16 @@
 /*
- * "$Id: snmp.c 6495 2007-04-30 21:23:04Z mike $"
+ * "$Id: snmp.c 6649 2007-07-11 21:46:42Z mike $"
  *
  *   SNMP discovery backend for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *
@@ -1826,8 +1817,14 @@ read_snmp_conf(const char *address)	/* I - Single address to probe */
 
   if (cupsArrayCount(Addresses) == 0)
   {
-    fputs("INFO: Using default SNMP Address @LOCAL\n", stderr);
-    add_array(Addresses, "@LOCAL");
+   /*
+    * If we have no addresses, exit immediately...
+    */
+
+    fprintf(stderr,
+            "DEBUG: No address specified and no Address line in %s...\n",
+	    filename);
+    exit(0);
   }
 
   if (cupsArrayCount(Communities) == 0)
@@ -2255,5 +2252,5 @@ update_cache(snmp_cache_t *device,	/* I - Device */
 
 
 /*
- * End of "$Id: snmp.c 6495 2007-04-30 21:23:04Z mike $".
+ * End of "$Id: snmp.c 6649 2007-07-11 21:46:42Z mike $".
  */