From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 12 Oct 2018 09:37:32 +0000 (+0200)
Subject: [#30,!37] Renamed variable.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38d61330a9219c9b951a2a6dd8f8968b7812e417;p=thirdparty%2Fkea.git

[#30,!37] Renamed variable.
---

diff --git a/src/bin/d2/d2_process.cc b/src/bin/d2/d2_process.cc
index 9ac6f07113..77c99c13ba 100644
--- a/src/bin/d2/d2_process.cc
+++ b/src/bin/d2/d2_process.cc
@@ -222,9 +222,11 @@ D2Process::configure(isc::data::ConstElementPtr config_set, bool check_only) {
 
     // Set the command channel.
     try {
-        isc::data::ConstElementPtr staging_socket;
-        staging_socket = getD2CfgMgr()->getControlSocketInfo();
-        configureCommandChannel(current_socket, staging_socket);
+        isc::data::ConstElementPtr socket_info;
+        socket_info = getD2CfgMgr()->getControlSocketInfo();
+        if (socket_info) {
+            configureCommandChannel(current_socket, socket_info);
+        }
     } catch (const isc::Exception& ex) {
         answer = isc::config::createAnswer(CONTROL_RESULT_ERROR, ex.what());
         return (answer);