cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[svn] Merge old trunk r2835: 

resolver: if sendto(2) fails, try sending to the next nameserver
This commit is contained in:
jilles 2007-03-28 08:04:06 -07:00
parent 8a1e143f6f
commit 42bda3f3d2
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
jilles 2007/03/28 14:54:10 UTC (20070328-3299)
Log:
Merge old trunk r2817:
WHOIS: Show the given nick in ERR_NOSUCHNICK even if it
starts with a digit. This is safe because the last
parameter is a nick and never a UID. (The first parameter
in a server-server two-param whois is a UID/SID.)
Changes: Modified:
+1 -1 trunk/modules/m_whois.c (File Modified)
jilles 2007/03/28 14:49:48 UTC (20070328-3297) jilles 2007/03/28 14:49:48 UTC (20070328-3297)
Log: Log:
Merge old trunk r2779,r2785: Merge old trunk r2779,r2785:

2
include/serno.h
View File

@ -1 +1 @@
#define SERNO "20070328-3297" #define SERNO "20070328-3299"

4
src/res.c
View File

@ -7,7 +7,7 @@
* The authors takes no responsibility for any damage or loss * The authors takes no responsibility for any damage or loss
* of property which results from the use of this software. * of property which results from the use of this software.
* *
* $Id: res.c 3227 2007-03-05 01:14:46Z jilles $ * $Id: res.c 3301 2007-03-28 15:04:06Z jilles $
* from Hybrid Id: res.c 459 2006-02-12 22:21:37Z db $ * from Hybrid Id: res.c 459 2006-02-12 22:21:37Z db $
* *
* July 1999 - Rewrote a bunch of stuff here. Change hostent builder code, * July 1999 - Rewrote a bunch of stuff here. Change hostent builder code,
@ -352,7 +352,7 @@ static int send_res_msg(const char *msg, int len, int rcount)
if (max_queries == 0) if (max_queries == 0)
max_queries = 1; max_queries = 1;
for (i = 0; i < max_queries; i++) for (i = 0; sent < max_queries && i < irc_nscount; i++)
{ {
if (sendto(res_fd, msg, len, 0, if (sendto(res_fd, msg, len, 0,
(struct sockaddr *)&(irc_nsaddr_list[i]), (struct sockaddr *)&(irc_nsaddr_list[i]),