[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-bugs
Subject:    Re: [cups.bugs] [HIGH] STR #4200: cupsd crashed with SIGABRT in __assert_fail_base()
From:       Michael Sweet <msweet () apple ! com>
Date:       2012-10-03 14:17:24
Message-ID: 20121003141725.4053E3C68413 () dns ! easysw ! com
[Download RAW message or body]

DO NOT REPLY TO THIS MESSAGE.  INSTEAD, POST ANY RESPONSES TO THE LINK BELOW.

[STR Closed w/Resolution]

Fixed in Subversion repository.

Link: http://www.cups.org/str.php?L4200
Version: 1.6.1
Fix Version: 1.7-current (r10640)
["str4200.patch" (text/plain)]

Index: scheduler/dirsvc.c
===================================================================
--- scheduler/dirsvc.c	(revision 10639)
+++ scheduler/dirsvc.c	(working copy)
@@ -459,6 +459,7 @@
   else
 #  endif /* __APPLE__ */
 #  ifdef HAVE_AVAHI
+  if (DNSSDClient)
   {
     const char	*host_name = avahi_client_get_host_name(DNSSDClient);
     const char	*host_fqdn = avahi_client_get_host_name_fqdn(DNSSDClient);
@@ -472,7 +473,8 @@
     else
       cupsdSetStringf(&DNSSDHostName, "%s.local", ServerName);
   }
-#  else /* HAVE_DNSSD */
+  else
+#  endif /* HAVE_AVAHI */
   {
     cupsdSetString(&DNSSDComputerName, ServerName);
 
@@ -481,7 +483,6 @@
     else
       cupsdSetStringf(&DNSSDHostName, "%s.local", ServerName);
   }
-#  endif /* HAVE_AVAHI */
 
  /*
   * Then (re)register the web interface if enabled...


_______________________________________________
cups-bugs mailing list
cups-bugs@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-bugs


[prev in list] [next in list] [prev in thread] [next in thread]