config: deprecate NoXX-Options

[ngircd-alex.git] / src / ngircd / conn.c

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 73a66bbb469cdc8f72d33574144b0ee3e1e7f293..6a1c056e21cf715128c2871f590af76cfdb01fce 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -82,6 +82,7 @@
 
 #define MAX_COMMANDS 3
 #define MAX_COMMANDS_SERVER 10
+#define MAX_COMMANDS_SERVICE MAX_COMMANDS_SERVER
 
 
 static bool Handle_Write PARAMS(( CONN_ID Idx ));
@@ -1380,10 +1381,10 @@ New_Connection(int Sock)
 
        identsock = new_sock;
 #ifdef IDENTAUTH
-       if (Conf_NoIdent)
+       if (!Conf_Ident)
                identsock = -1;
 #endif
-       if (!Conf_NoDNS)
+       if (Conf_DNS)
                Resolve_Addr(&My_Connections[new_sock].proc_stat, &new_addr,
                             identsock, cb_Read_Resolver_Result);
 
@@ -1530,7 +1531,7 @@ Read_Request( CONN_ID Idx )
 /**
  * Handle all data in the connection read-buffer.
  * Data is processed until no complete command is left in the read buffer,
- * or MAX_COMMANDS[_SERVER] commands were processed.
+ * or MAX_COMMANDS[_SERVER|_SERVICE] commands were processed.
  * When a fatal error occurs, the connection is shut down.
  * @param Idx Index of the connection.
  * @return number of bytes processed.
@@ -1555,8 +1556,12 @@ Handle_Buffer(CONN_ID Idx)
 
        /* Servers do get special command limits, so they can process
         * all the messages that are required while peering. */
-       if (Client_Type(c) == CLIENT_SERVER)
-               maxcmd = MAX_COMMANDS_SERVER;
+       switch (Client_Type(c)) {
+           case CLIENT_SERVER:
+               maxcmd = MAX_COMMANDS_SERVER; break;
+           case CLIENT_SERVICE:
+               maxcmd = MAX_COMMANDS_SERVICE; break;
+       }
 
        starttime = time(NULL);
        for (i=0; i < maxcmd; i++) {