repo: ngircd
action: commit
revision: 
path_from: 
revision_from: d4632a727fbee65cb1585c6f6e9968d830f23a19:
path_to: 
revision_to: 
git.thebackupbox.net
ngircd
git clone git://git.thebackupbox.net/ngircd
commit d4632a727fbee65cb1585c6f6e9968d830f23a19
Author: Alexander Barton 
Date:   Fri May 21 23:47:28 2010 +0200

    Don't set a penalty time when doing DNS lookups

    The logic isn't as described in the source and intended by this code:
    ngIRCd doesn't wait for the asynchronous resolver process until the set
    penalty time is over, but until the forked process terminates or the
    initial connection timeout (= PongTimeout) triggers.

    So don't set the penalty time at all and remove the wrong comment.

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index dff9336f65af4c2f7e581185d1396047e7b5d92b..
index ..0d82d530b80733dc23fd18e827b5142bfd06ca54 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -1382,11 +1382,6 @@ New_Connection(int Sock)
 		Resolve_Addr(&My_Connections[new_sock].proc_stat, &new_addr,
 			     identsock, cb_Read_Resolver_Result);

-	/* ngIRCd waits up to 4 seconds for the result of the asynchronous
-	 * DNS and IDENT resolver subprocess using the "penalty" mechanism.
-	 * If there are results earlier, the delay is aborted. */
-	Conn_SetPenalty(new_sock, 4);
-
 	Account_Connection();
 	return new_sock;
 } /* New_Connection */

-----END OF PAGE-----