[svn] commit: r1132 - /trunk/src/bin/auth/main.cc

[BIND 10 source code commits]

Author: jinmei
Date: Fri Mar  5 17:54:25 2010
New Revision: 1132

Log:
- corrected the condition for the case of !-4
- (minor style change) simplified some if conditions

Modified:
    trunk/src/bin/auth/main.cc

Modified: trunk/src/bin/auth/main.cc
==============================================================================
--- trunk/src/bin/auth/main.cc (original)
+++ trunk/src/bin/auth/main.cc Fri Mar  5 17:54:25 2010
@@ -161,7 +161,7 @@
             exit(1);
         }
     }
-    if (!ipv6_only) {
+    if (!ipv4_only) {
         ps6 = getSocket(AF_INET6, port);
         if (ps6 < 0) {
             if (ps4 < 0) {
@@ -208,17 +208,13 @@
                 throw FatalError("select error");
             }
 
-            if (ps4 >= 0) {
-                if (FD_ISSET(ps4, &fds)) {
-                    ++counter;
-                    auth_server->processMessage(ps4);
-                }
-            }
-            if (ps6 >= 0) {
-                if (FD_ISSET(ps6, &fds)) {
-                    ++counter;
-                    auth_server->processMessage(ps6);
-                }
+            if (ps4 >= 0 && FD_ISSET(ps4, &fds)) {
+                ++counter;
+                auth_server->processMessage(ps4);
+            }
+            if (ps6 >= 0 && FD_ISSET(ps6, &fds)) {
+                ++counter;
+                auth_server->processMessage(ps6);
             }
     
             if (FD_ISSET(ss, &fds)) {