* Don't warn about not being able to open port 113 for identd.

svn: 1009

doc/UPDATES

@@ -6,6 +6,7 @@ This is a summary of ChangeLog basically.
 2.Fixed a chmod() problem when the config was missing.
 3.Fixed config file not saving/recognizing IPV6 ip.
 4.Fixed problem with cmd_chattr +pj
+5.No longer warning about "Can't create new socket" for identd.
 
 1.1.7
 

src/dccutil.c

@@ -682,11 +682,13 @@ void identd_open()
 
   idx = -1;
 
+  identd_hack = 1;
 #ifdef USE_IPV6
   i = open_listen_by_af(&port, AF_INET6);
 #else
   i = open_listen(&port);
 #endif /* USE_IPV6 */
+  identd_hack = 0;
   if (i > 0) {
     idx = new_dcc(&DCC_IDENTD_CONNECT, 0);
     if (idx > 0) {

src/net.c

@@ -46,6 +46,7 @@ union sockaddr_union cached_myip4_so;
 union sockaddr_union cached_myip6_so;
 #endif /* USE_IPV6 */
 
+int     identd_hack = 0;	/* identd_open() won't work on most servers, dont even bother warning. */
 char	firewall[121] = "";	/* Socks server for firewall		    */
 port_t	firewallport = 1080;	/* Default port of Sock4/5 firewalls	    */
 char	botuser[21] = ""; 	/* Username of the user running the bot    */
@@ -486,8 +487,10 @@ int real_getsock(int options, char *fname, int line)
 
   if (sock >= 0)
     setsock(sock, options);
-  else
+  else if (!identd_hack)
     putlog(LOG_WARNING, "*", "Warning: Can't create new socket! (%s:%d)", fname, line);
+  else if (identd_hack)
+    identd_hack = 0;
   return sock;
 }
 

src/net.h

@@ -174,7 +174,7 @@ extern unsigned long			notalloc;
 #endif /* USE_IPV6 */
 
 extern char				firewall[], botuser[];
-extern int				resolve_timeout, MAXSOCKS;
+extern int				resolve_timeout, MAXSOCKS, identd_hack;
 extern port_t				firewallport;
 extern jmp_buf				alarmret;
 extern sock_list			*socklist;