From: JINMEI Tatuya <jinmei@isc.org>
Date: Tue, 17 Jan 2012 17:50:48 +0000 (-0800)
Subject: [master] Merge branch 'trac1546'
X-Git-Tag: trac2351_base~296^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5589ea8da0a906e66eed1d85b26da4e75e3902a2;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1546'
---

5589ea8da0a906e66eed1d85b26da4e75e3902a2
diff --cc src/bin/resolver/main.cc
index 4834458881,2026e4e405..bfcad6790a
--- a/src/bin/resolver/main.cc
+++ b/src/bin/resolver/main.cc
@@@ -202,12 -208,20 +202,15 @@@ main(int argc, char* argv[]) 
          LOG_DEBUG(resolver_logger, RESOLVER_DBG_INIT, RESOLVER_SERVICE_CREATED);
  
          cc_session = new Session(io_service.get_io_service());
-         isc::server_common::initSocketReqeustor(*cc_session);
+         isc::server_common::initSocketRequestor(*cc_session);
+ 
+         // We delay starting listening to new commands/config just before we
+         // go into the main loop.   See auth/main.cc for the rationale.
          config_session = new ModuleCCSession(specfile, *cc_session,
                                               my_config_handler,
-                                              my_command_handler);
+                                              my_command_handler, false);
          LOG_DEBUG(resolver_logger, RESOLVER_DBG_INIT, RESOLVER_CONFIG_CHANNEL);
  
 -        // FIXME: This does not belong here, but inside Boss
 -        if (uid != NULL) {
 -            changeUser(uid);
 -        }
 -
          resolver->setConfigSession(config_session);
          // Install all initial configurations.  If loading configuration
          // fails, it will be logged, but we start the server anyway, giving