Import CUPS 1.4svn r7023 into easysw/current.

[thirdparty/cups.git] / backend / pap.c

diff --git a/backend/pap.c b/backend/pap.c
index 7f04214fa07100a0465b2289071ec7a2641f9e1b..df177bb4a3b35bfb9d866fbcd0a71486dcda52ae 100644 (file)
--- a/backend/pap.c
+++ b/backend/pap.c
@@ -1,5 +1,5 @@
 /*
-* "$Id: pap.c 6911 2007-09-04 20:35:08Z mike $"
+* "$Id: pap.c 7010 2007-10-10 21:08:51Z mike $"
 *
 * © Copyright 2004 Apple Computer, Inc. All rights reserved.
 * 
@@ -207,12 +207,7 @@ int main (int argc, const char * argv[])
 
   if (argc == 1 || (argc == 2 && strcmp(argv[1], "-discover") == 0))
   {
-    /* If listDevices() didn't find any devices or returns an error output a 
-    *  legacy style announcement.
-    *  
-    */
-    if (listDevices() <= 0)
-      puts("network pap \"Unknown\" \"AppleTalk Printer Access Protocol (pap)\"");
+    listDevices();
 
     return 0;
   }
@@ -291,7 +286,7 @@ static int listDevices(void)
   /* Make sure it's okay to use appletalk */
   if (!okayToUseAppleTalk())
   {
-    fprintf(stderr, "ERROR: AppleTalk disabled in System Preferences\n");
+    fprintf(stderr, "INFO: AppleTalk disabled in System Preferences\n");
     return -1;  /* Network is down */
   }