* Ported [2843] to 1.2.10

 * Now supressing "port taken" error on hub startup.


svn: 2844

doc/UPDATES

@@ -25,6 +25,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Fixed a sharing segfault with an empty userfile. (fixes #243)
 * Hubs will now boot removed users/bots upon userfile reload. (addresses #243)
 * Fix typo in help file for 'botpart' (fixes #259)
+* Now supressing "port taken" error on hub startup.
 
 1.2.9 - http://tracker.shatow.net/milestone/1.2.9
 * Fixed cmd_[un]stick not properly using numbers for channel masks. (#160)

src/dccutil.c

@@ -883,8 +883,9 @@ listen_all(port_t lport, bool off)
       i = open_listen(&port);
 #endif /* USE_IPV6 */
       if (i < 0) {
-        putlog(LOG_ERRORS, "*", "Can't open IPv4 listening port %d - %s", port,
-               i == -1 ? "it's taken." : "couldn't assign ip.");
+        if (i6 < 0)
+          putlog(LOG_ERRORS, "*", "Can't open IPv4 listening port %d - %s", port,
+                 i == -1 ? "it's taken." : "couldn't assign ip.");
       } else {
         /* now setup ipv4 listening port */
         idx = new_dcc(&DCC_TELNET, 0);