Attachment #98940 for bug #137923

View | Details | Raw Unified | Return to bug 137923
Collapse All | Expand All

Lines 6-13 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/irc/unreal/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= Unreal	8	PORTNAME= Unreal
9	PORTVERSION= 3.2.7	9	PORTVERSION= 3.2.8.1
10	PORTREVISION= 3
11	CATEGORIES= irc ipv6	10	CATEGORIES= irc ipv6
12	MASTER_SITES= http://unrealircd.pimpmylinux.org/ \	11	MASTER_SITES= http://unrealircd.pimpmylinux.org/ \
13	http://unrealircd.icedslash.com/	12	http://unrealircd.icedslash.com/
Lines 18-24 Link Here
18		17
19	LIB_DEPENDS= cares.2:${PORTSDIR}/dns/c-ares	18	LIB_DEPENDS= cares.2:${PORTSDIR}/dns/c-ares
20		19
21	WRKSRC= ${WRKDIR}/${DISTNAME}	20	WRKSRC= ${WRKDIR}/${PORTNAME}3.2
22		21
23	MODULESDIR= ${PREFIX}/lib/${PORTNAME}	22	MODULESDIR= ${PREFIX}/lib/${PORTNAME}
24	CONFIGDIR= ${PREFIX}/etc/${PORTNAME}	23	CONFIGDIR= ${PREFIX}/etc/${PORTNAME}

Lines 1-3 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/irc/unreal/distinfo (-3 / +3 lines)
1	MD5 (Unreal3.2.7.tar.gz) = 39d3a58f4ad7b5407b6e2093f666b20c	1	MD5 (Unreal3.2.8.1.tar.gz) = 7b741e94e867c0a7370553fd01506c66
2	SHA256 (Unreal3.2.7.tar.gz) = f80078da5e9efa1487ab22957aeb295f94c2d4efd144f825f1efc5ee8df72d46	2	SHA256 (Unreal3.2.8.1.tar.gz) = 009add8da68b6fb66608d06302e59fa9fb994f901cbd92e6f4f10963f2077741
3	SIZE (Unreal3.2.7.tar.gz) = 2801622	3	SIZE (Unreal3.2.8.1.tar.gz) = 2866456

Lines 1-5 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/irc/unreal/files/patch-Makefile.in (-2 / +2 lines)
1	--- Makefile.in.orig Tue Dec 5 15:59:38 2006	1	--- Makefile.in 2009-04-13 13:03:55.000000000 +0200
2	+++ Makefile.in Tue Dec 5 15:59:53 2006	2	+++ Makefile.in 2009-08-18 16:14:35.000000000 +0200
3	@@ -38,7 +38,7 @@	3	@@ -38,7 +38,7 @@
4	CRYPTOLIB=@CRYPTOLIB@	4	CRYPTOLIB=@CRYPTOLIB@
5	OPENSSLINCLUDES=	5	OPENSSLINCLUDES=




--- configure.orig	Fri Dec 22 22:10:28 2006
+++ configure	Wed Jan  3 09:59:42 2007
@@ -12700,35 +12700,6 @@
 
 cd $cur_dir
 
-
-cares_version="1.4.0"
-echo "$as_me:$LINENO: result: extracting c-ares resolver library" >&5
-echo "${ECHO_T}extracting c-ares resolver library" >&6
-cur_dir=`pwd`
-cd extras
-rm -rf c-ares-$cares_version
-if test "x$ac_cv_path_GUNZIP" = "x" ; then
-	tar xfz c-ares.tar.gz
-else
-	cp c-ares.tar.gz c-ares.tar.gz.bak
-	gunzip -f c-ares.tar.gz
-	cp c-ares.tar.gz.bak c-ares.tar.gz
-	tar xf c-ares.tar
-fi
-echo "$as_me:$LINENO: result: configuring c-ares library" >&5
-echo "${ECHO_T}configuring c-ares library" >&6
-cd c-ares-$cares_version
-./configure --prefix=$cur_dir/extras/c-ares || exit 1
-echo "$as_me:$LINENO: result: compiling c-ares resolver library" >&5
-echo "${ECHO_T}compiling c-ares resolver library" >&6
-$ac_cv_prog_MAKER || exit 1
-echo "$as_me:$LINENO: result: installing c-ares resolver library" >&5
-echo "${ECHO_T}installing c-ares resolver library" >&6
-$ac_cv_prog_MAKER install || exit 1
-CARESINCDIR="$cur_dir/extras/c-ares/include"
-
-CARESLIBDIR="-L../extras/c-ares/lib"
-
 CARESLIBS="-lcares"
 
 cd $cur_dir




--- doc/example.conf	2009-04-13 13:03:55.000000000 +0200
+++ doc/example.conf	2009-08-18 16:36:29.000000000 +0200
@@ -33,8 +33,8 @@
  */
 
 /* FOR *NIX, uncomment the following 2lines: */

 
 /* FOR Windows, uncomment the following 2 lines: */
 //loadmodule "modules/commands.dll";
@@ -377,7 +377,7 @@
  * };
  */
 

 	/* Delete the log file and start a new one when it reaches 2MB, leave this out to always use the 
 	   same log */
 	maxsize 2097152;
@@ -520,8 +520,8 @@
 
 tld {
 	mask *@*.fr;
-	motd "ircd.motd.fr";
-	rules "ircd.rules.fr";
+	motd "ircd.motd";
+	rules "ircd.rules";
 };
 
 /* note: you can just delete the example block above,


Lines 1-6 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/irc/unreal/files/patch-ircd.c (-3 / +3 lines)
1	--- src/ircd.c Wed Oct 27 20:45:26 2004	1	--- src/ircd.c 2009-03-01 19:37:58.000000000 +0100
2	+++ src/ircd.c Mon Feb 7 04:19:55 2005	2	+++ src/ircd.c 2009-08-18 16:20:39.000000000 +0200
3	@@ -1182,9 +1182,9 @@	3	@@ -1369,9 +1369,9 @@
4	}	4	}
5	#endif	5	#endif
6	#ifndef _WIN32	6	#ifndef _WIN32

Lines 1-5 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/irc/unreal/files/patch-makenet (-2 / +2 lines)
1	--- networks/makenet Sun Apr 25 01:19:28 2004	1	--- networks/makenet 2004-04-25 01:19:28.000000000 +0200
2	+++ networks/makenet Mon Feb 7 04:24:00 2005	2	+++ networks/makenet 2009-08-18 16:21:50.000000000 +0200
3	@@ -241,10 +241,10 @@	3	@@ -241,10 +241,10 @@
4	__EOF__	4	__EOF__
5		5

Lines 1-6 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/irc/unreal/files/patch-modules.c (-15 / +11 lines)
1	--- src/modules.c Wed Oct 27 20:45:27 2004	1	--- src/modules.c 2009-04-13 13:03:58.000000000 +0200
2	+++ src/modules.c Mon Feb 7 04:01:47 2005	2	+++ src/modules.c 2009-08-18 16:29:34.000000000 +0200
3	@@ -90,12 +90,12 @@	3	@@ -177,12 +177,12 @@
4	{	4	{
5	char tempbuf[PATH_MAX+1];	5	char tempbuf[PATH_MAX+1];
6	#ifndef _WIN32	6	#ifndef _WIN32
Lines 15-21 Link Here
15	strerror(errno));	15	strerror(errno));
16	if (!loop.ircd_booted)	16	if (!loop.ircd_booted)
17	exit(7);	17	exit(7);
18	@@ -106,7 +106,7 @@	18	@@ -193,19 +193,19 @@
19	{	19	{
20	if (!strcmp(dir->d_name, ".") \|\| !strcmp(dir->d_name, ".."))	20	if (!strcmp(dir->d_name, ".") \|\| !strcmp(dir->d_name, ".."))
21	continue;	21	continue;
Lines 24-30 Link Here
24	strcat(tempbuf, dir->d_name);	24	strcat(tempbuf, dir->d_name);
25	remove(tempbuf);	25	remove(tempbuf);
26	}	26	}
27	@@ -118,7 +118,7 @@	27	closedir(fd);
		28	#else
		29	WIN32_FIND_DATA hData;
		30	- HANDLE hFile = FindFirstFile("tmp/*", &hData);
		31	+ HANDLE hFile = FindFirstFile("%%RUNDIR%%/tmp/*", &hData);
		32	if (hFile != INVALID_HANDLE_VALUE)
28	{	33	{
29	if (strcmp(hData.cFileName, ".") \|\| strcmp(hData.cFileName, ".."))	34	if (strcmp(hData.cFileName, ".") \|\| strcmp(hData.cFileName, ".."))
30	{	35	{
Lines 33-39 Link Here
33	strcat(tempbuf, hData.cFileName);	38	strcat(tempbuf, hData.cFileName);
34	remove(tempbuf);	39	remove(tempbuf);
35	}	40	}
36	@@ -127,7 +127,7 @@	41	@@ -214,7 +214,7 @@
37	{	42	{
38	if (!strcmp(hData.cFileName, ".") \|\| !strcmp(hData.cFileName, ".."))	43	if (!strcmp(hData.cFileName, ".") \|\| !strcmp(hData.cFileName, ".."))
39	continue;	44	continue;
Lines 42-53 Link Here
42	strcat(tempbuf, hData.cFileName);	47	strcat(tempbuf, hData.cFileName);
43	remove(tempbuf);	48	remove(tempbuf);
44	}	49	}
45	@@ -200,7 +200,7 @@
46	path = path_;
47
48
49	- tmppath = unreal_mktemp("tmp", unreal_getfilename(path));
50	+ tmppath = unreal_mktemp("%%RUNDIR%%/tmp", unreal_getfilename(path));
51	if (!tmppath)
52	return "Unable to create temporary file!";
53	if(!strchr(path, '/'))




--- src/res.c	2006-09-19 15:45:18.000000000 +0300
+++ src/res.c	2009-06-17 17:50:18.000000000 +0300
@@ -48,10 +48,15 @@
 
 #include <res.h>
 
+/* Prevent crashes due to invalid prototype/ABI */
+#if ARES_VERSION < 0x010600
+ #error "You have an old c-ares version on your system and/or Unreals c-ares failed to compile!"
+#endif
+
 /* Forward declerations */
-void unrealdns_cb_iptoname(void *arg, int status, struct hostent *he);
-void unrealdns_cb_nametoip_verify(void *arg, int status, struct hostent *he);
-void unrealdns_cb_nametoip_link(void *arg, int status, struct hostent *he);
+void unrealdns_cb_iptoname(void *arg, int status, int timeouts, struct hostent *he);
+void unrealdns_cb_nametoip_verify(void *arg, int status, int timeouts, struct hostent *he);
+void unrealdns_cb_nametoip_link(void *arg, int status, int timeouts, struct hostent *he);
 void unrealdns_delasyncconnects(void);
 static unsigned int unrealdns_haship(void *binaryip, int length);
 static void unrealdns_addtocache(char *name, void *binaryip, int length);
@@ -240,7 +245,7 @@
 #endif
 }
 
-void unrealdns_cb_iptoname(void *arg, int status, struct hostent *he)
+void unrealdns_cb_iptoname(void *arg, int status, int timeouts, struct hostent *he)
 {
 DNSReq *r = (DNSReq *)arg;
 DNSReq *newr;
@@ -290,7 +295,7 @@
 }
 
 
-void unrealdns_cb_nametoip_verify(void *arg, int status, struct hostent *he)
+void unrealdns_cb_nametoip_verify(void *arg, int status, int timeouts, struct hostent *he)
 {
 DNSReq *r = (DNSReq *)arg;
 aClient *acptr = r->cptr;
@@ -363,7 +368,7 @@
 	unrealdns_freeandremovereq(r);
 }
 
-void unrealdns_cb_nametoip_link(void *arg, int status, struct hostent *he)
+void unrealdns_cb_nametoip_link(void *arg, int status, int timeouts, struct hostent *he)
 {
 DNSReq *r = (DNSReq *)arg;
 int n;
@@ -390,9 +395,11 @@
 		/* fatal error while resolving */
 		sendto_realops("Unable to resolve hostname '%s', when trying to connect to server %s.",
 			r->name, r->linkblock->servername);
+		r->linkblock->refcount--;
 		unrealdns_freeandremovereq(r);
 		return;
 	}
+	r->linkblock->refcount--;
 
 #ifdef INET6
 	if (((he->h_length != 4) && (he->h_length != 16)) || !he->h_addr_list[0])
@@ -715,21 +722,34 @@
 	} else
 	if (*param == 'i') /* INFORMATION */
 	{
-		struct ares_config_info inf;
+		struct ares_options inf;
 		int i;
+		int optmask;
 		
-		ares_get_config(&inf, resolver_channel);
+		ares_save_options(resolver_channel, &inf, &optmask);
 
 		sendtxtnumeric(sptr, "****** DNS Configuration Information ******");
 		sendtxtnumeric(sptr, " c-ares version: %s",ares_version(NULL));
-		sendtxtnumeric(sptr, "        timeout: %d", inf.timeout);
-		sendtxtnumeric(sptr, "          tries: %d", inf.tries);
-		sendtxtnumeric(sptr, "   # of servers: %d", inf.numservers);
-		for (i = 0; i < inf.numservers; i++)
-			sendtxtnumeric(sptr, "      server #%d: %s", i+1, inf.servers[i] ? inf.servers[i] : "[???]");
-			
-		/* TODO: free or get memleak ! */
+
+		if(optmask & ARES_OPT_TIMEOUTMS)
+			sendtxtnumeric(sptr, "        timeout: %d", inf.timeout);
+		if(optmask & ARES_OPT_TRIES)
+			sendtxtnumeric(sptr, "          tries: %d", inf.tries);
+		if(optmask & ARES_OPT_SERVERS)
+		{
+			sendtxtnumeric(sptr, "   # of servers: %d", inf.nservers);
+			for (i = 0; i < inf.nservers; i++)
+				sendtxtnumeric(sptr, "      server #%d: %s", i+1, inet_ntoa(inf.servers[i]));	
+		}
+		if(optmask & ARES_OPT_DOMAINS)
+		{
+			sendtxtnumeric(sptr, "   # of search domains: %d", inf.ndomains);
+			for (i = 0; i < inf.ndomains; i++)
+				sendtxtnumeric(sptr, "      domain #%d: %s", i+1, inf.domains[i]);
+		}
 		sendtxtnumeric(sptr, "****** End of DNS Configuration Info ******");
+		
+		ares_destroy_options(&inf);
 	} else /* STATISTICS */
 	{
 		sendtxtnumeric(sptr, "DNS CACHE Stats:");

Lines 87-92 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/irc/unreal/pkg-plist (+2 lines)
87	lib/Unreal/cloak.so	87	lib/Unreal/cloak.so
88	lib/Unreal/commands.so	88	lib/Unreal/commands.so
89	lib/Unreal/m_addline.so	89	lib/Unreal/m_addline.so
		90	lib/Unreal/m_addmotd.so
90	lib/Unreal/m_addomotd.so	91	lib/Unreal/m_addomotd.so
91	lib/Unreal/m_admin.so	92	lib/Unreal/m_admin.so
92	lib/Unreal/m_adminchat.so	93	lib/Unreal/m_adminchat.so
Lines 155-160 Link Here
155	lib/Unreal/m_svsfline.so	156	lib/Unreal/m_svsfline.so
156	lib/Unreal/m_svsjoin.so	157	lib/Unreal/m_svsjoin.so
157	lib/Unreal/m_svskill.so	158	lib/Unreal/m_svskill.so
		159	lib/Unreal/m_svslusers.so
158	lib/Unreal/m_svsmode.so	160	lib/Unreal/m_svsmode.so
159	lib/Unreal/m_svsmotd.so	161	lib/Unreal/m_svsmotd.so
160	lib/Unreal/m_svsnick.so	162	lib/Unreal/m_svsnick.so

Return to bug 137923

Lines 1-6 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/irc/unreal/files/patch-config.h (-6 / +6 lines)
1	--- include/config.h Sun Mar 13 22:02:43 2005	1	--- include/config.h 2009-04-13 13:03:57.000000000 +0200
2	+++ include/config.h Mon Mar 21 09:10:41 2005	2	+++ include/config.h 2009-08-18 16:16:39.000000000 +0200
3	@@ -201,16 +201,16 @@	3	@@ -210,16 +210,16 @@
4	* these are only the recommened names and paths. Change as needed.	4	* these are only the recommened names and paths. Change as needed.
5	* You must define these to something, even if you don't really want them.	5	* You must define these to something, even if you don't really want them.
6	*/	6	*/
Lines 16-24 Link Here
16	-#define IRCDTUNE "ircd.tune" /* tuning .. */	16	-#define IRCDTUNE "ircd.tune" /* tuning .. */
17	+#define CPATH "%%PREFIX%%/etc/Unreal/unrealircd.conf" /* server configuration file */	17	+#define CPATH "%%PREFIX%%/etc/Unreal/unrealircd.conf" /* server configuration file */
18	+#define MPATH "%%PREFIX%%/etc/Unreal/ircd.motd" /* server MOTD file */	18	+#define MPATH "%%PREFIX%%/etc/Unreal/ircd.motd" /* server MOTD file */
19	+#define SMPATH "%%PREFIX%%/etc/Unreal/ircd.smotd" /* short MOTD file */	19	+#define SMPATH "%%PREFIX%%/etc/Unreal/ircd.smotd" /* short MOTD file */
20	+#define RPATH "%%PREFIX%%/etc/Unreal/ircd.rules" /* server rules file */	20	+#define RPATH "%%PREFIX%%/etc/Unreal/ircd.rules" /* server rules file */
21	+#define OPATH "%%PREFIX%%/etc/Unreal/oper.motd" /* Operators MOTD file */	21	+#define OPATH "%%PREFIX%%/etc/Unreal/oper.motd" /* Operators MOTD file */
22	+#define LPATH "%%LOGDIR%%/debug.log" /* Where the debug file lives, if DEBUGMODE */	22	+#define LPATH "%%LOGDIR%%/debug.log" /* Where the debug file lives, if DEBUGMODE */
23	+#define PPATH "%%RUNDIR%%/ircd.pid" /* file for server pid */	23	+#define PPATH "%%RUNDIR%%/ircd.pid" /* file for server pid */
24	+#define VPATH "%%PREFIX%%/etc/Unreal/ircd.svsmotd" /* Services MOTD append. */	24	+#define VPATH "%%PREFIX%%/etc/Unreal/ircd.svsmotd" /* Services MOTD append. */

Lines 1-38 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/irc/unreal/files/patch-configure (-38 lines)
1	--- configure.orig Fri Dec 22 22:10:28 2006
2	+++ configure Wed Jan 3 09:59:42 2007
3	@@ -12700,35 +12700,6 @@
4
5	cd $cur_dir
6
7	-
8	-cares_version="1.4.0"
9	-echo "$as_me:$LINENO: result: extracting c-ares resolver library" >&5
10	-echo "${ECHO_T}extracting c-ares resolver library" >&6
11	-cur_dir=`pwd`
12	-cd extras
13	-rm -rf c-ares-$cares_version
14	-if test "x$ac_cv_path_GUNZIP" = "x" ; then
15	- tar xfz c-ares.tar.gz
16	-else
17	- cp c-ares.tar.gz c-ares.tar.gz.bak
18	- gunzip -f c-ares.tar.gz
19	- cp c-ares.tar.gz.bak c-ares.tar.gz
20	- tar xf c-ares.tar
21	-fi
22	-echo "$as_me:$LINENO: result: configuring c-ares library" >&5
23	-echo "${ECHO_T}configuring c-ares library" >&6
24	-cd c-ares-$cares_version
25	-./configure --prefix=$cur_dir/extras/c-ares \|\| exit 1
26	-echo "$as_me:$LINENO: result: compiling c-ares resolver library" >&5
27	-echo "${ECHO_T}compiling c-ares resolver library" >&6
28	-$ac_cv_prog_MAKER \|\| exit 1
29	-echo "$as_me:$LINENO: result: installing c-ares resolver library" >&5
30	-echo "${ECHO_T}installing c-ares resolver library" >&6
31	-$ac_cv_prog_MAKER install \|\| exit 1
32	-CARESINCDIR="$cur_dir/extras/c-ares/include"
33	-
34	-CARESLIBDIR="-L../extras/c-ares/lib"
35	-
36	CARESLIBS="-lcares"
37
38	cd $cur_dir

Lines 1-6 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/irc/unreal/files/patch-example.conf (-16 / +4 lines)
1	--- doc/example.conf Wed Oct 27 20:45:03 2004	1	--- doc/example.conf 2009-04-13 13:03:55.000000000 +0200
2	+++ doc/example.conf Mon Feb 7 03:58:38 2005	2	+++ doc/example.conf 2009-08-18 16:36:29.000000000 +0200
3	@@ -31,8 +31,8 @@	3	@@ -33,8 +33,8 @@
4	*/	4	*/
5		5
6	/* FOR NIX, uncomment the following 2lines: /	6	/* FOR NIX, uncomment the following 2lines: /
Lines 11-17 Link Here
11		11
12	/* FOR Windows, uncomment the following 2 lines: */	12	/* FOR Windows, uncomment the following 2 lines: */
13	//loadmodule "modules/commands.dll";	13	//loadmodule "modules/commands.dll";
14	@@ -374,7 +374,7 @@	14	@@ -377,7 +377,7 @@
15	* };	15	* };
16	*/	16	*/
17		17
Lines 20-34 Link Here
20	/* Delete the log file and start a new one when it reaches 2MB, leave this out to always use the	20	/* Delete the log file and start a new one when it reaches 2MB, leave this out to always use the
21	same log */	21	same log */
22	maxsize 2097152;	22	maxsize 2097152;
23	@@ -520,8 +520,8 @@
24
25	tld {
26	mask @.fr;
27	- motd "ircd.motd.fr";
28	- rules "ircd.rules.fr";
29	+ motd "ircd.motd";
30	+ rules "ircd.rules";
31	};
32
33	/* note: you can just delete the example block above,
34

Lines 1-104 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/irc/unreal/files/patch-res.c (-104 lines)
1	--- src/res.c 2006-09-19 15:45:18.000000000 +0300
2	+++ src/res.c 2009-06-17 17:50:18.000000000 +0300
3	@@ -48,10 +48,15 @@
4
5	#include <res.h>
6
7	+/* Prevent crashes due to invalid prototype/ABI */
8	+#if ARES_VERSION < 0x010600
9	+ #error "You have an old c-ares version on your system and/or Unreals c-ares failed to compile!"
10	+#endif
11	+
12	/* Forward declerations */
13	-void unrealdns_cb_iptoname(void arg, int status, struct hostent he);
14	-void unrealdns_cb_nametoip_verify(void arg, int status, struct hostent he);
15	-void unrealdns_cb_nametoip_link(void arg, int status, struct hostent he);
16	+void unrealdns_cb_iptoname(void arg, int status, int timeouts, struct hostent he);
17	+void unrealdns_cb_nametoip_verify(void arg, int status, int timeouts, struct hostent he);
18	+void unrealdns_cb_nametoip_link(void arg, int status, int timeouts, struct hostent he);
19	void unrealdns_delasyncconnects(void);
20	static unsigned int unrealdns_haship(void *binaryip, int length);
21	static void unrealdns_addtocache(char name, void binaryip, int length);
22	@@ -240,7 +245,7 @@
23	#endif
24	}
25
26	-void unrealdns_cb_iptoname(void arg, int status, struct hostent he)
27	+void unrealdns_cb_iptoname(void arg, int status, int timeouts, struct hostent he)
28	{
29	DNSReq r = (DNSReq )arg;
30	DNSReq *newr;
31	@@ -290,7 +295,7 @@
32	}
33
34
35	-void unrealdns_cb_nametoip_verify(void arg, int status, struct hostent he)
36	+void unrealdns_cb_nametoip_verify(void arg, int status, int timeouts, struct hostent he)
37	{
38	DNSReq r = (DNSReq )arg;
39	aClient *acptr = r->cptr;
40	@@ -363,7 +368,7 @@
41	unrealdns_freeandremovereq(r);
42	}
43
44	-void unrealdns_cb_nametoip_link(void arg, int status, struct hostent he)
45	+void unrealdns_cb_nametoip_link(void arg, int status, int timeouts, struct hostent he)
46	{
47	DNSReq r = (DNSReq )arg;
48	int n;
49	@@ -390,9 +395,11 @@
50	/* fatal error while resolving */
51	sendto_realops("Unable to resolve hostname '%s', when trying to connect to server %s.",
52	r->name, r->linkblock->servername);
53	+ r->linkblock->refcount--;
54	unrealdns_freeandremovereq(r);
55	return;
56	}
57	+ r->linkblock->refcount--;
58
59	#ifdef INET6
60	if (((he->h_length != 4) && (he->h_length != 16)) \|\| !he->h_addr_list[0])
61	@@ -715,21 +722,34 @@
62	} else
63	if (param == 'i') / INFORMATION */
64	{
65	- struct ares_config_info inf;
66	+ struct ares_options inf;
67	int i;
68	+ int optmask;
69
70	- ares_get_config(&inf, resolver_channel);
71	+ ares_save_options(resolver_channel, &inf, &optmask);
72
73	sendtxtnumeric(sptr, "**** DNS Configuration Information ****");
74	sendtxtnumeric(sptr, " c-ares version: %s",ares_version(NULL));
75	- sendtxtnumeric(sptr, " timeout: %d", inf.timeout);
76	- sendtxtnumeric(sptr, " tries: %d", inf.tries);
77	- sendtxtnumeric(sptr, " # of servers: %d", inf.numservers);
78	- for (i = 0; i < inf.numservers; i++)
79	- sendtxtnumeric(sptr, " server #%d: %s", i+1, inf.servers[i] ? inf.servers[i] : "[???]");
80	-
81	- /* TODO: free or get memleak ! */
82	+
83	+ if(optmask & ARES_OPT_TIMEOUTMS)
84	+ sendtxtnumeric(sptr, " timeout: %d", inf.timeout);
85	+ if(optmask & ARES_OPT_TRIES)
86	+ sendtxtnumeric(sptr, " tries: %d", inf.tries);
87	+ if(optmask & ARES_OPT_SERVERS)
88	+ {
89	+ sendtxtnumeric(sptr, " # of servers: %d", inf.nservers);
90	+ for (i = 0; i < inf.nservers; i++)
91	+ sendtxtnumeric(sptr, " server #%d: %s", i+1, inet_ntoa(inf.servers[i]));
92	+ }
93	+ if(optmask & ARES_OPT_DOMAINS)
94	+ {
95	+ sendtxtnumeric(sptr, " # of search domains: %d", inf.ndomains);
96	+ for (i = 0; i < inf.ndomains; i++)
97	+ sendtxtnumeric(sptr, " domain #%d: %s", i+1, inf.domains[i]);
98	+ }
99	sendtxtnumeric(sptr, "**** End of DNS Configuration Info ****");
100	+
101	+ ares_destroy_options(&inf);
102	} else /* STATISTICS */
103	{
104	sendtxtnumeric(sptr, "DNS CACHE Stats:");