From e9dc40717e56a58a3e07b206ccf9a45f865731b2 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Thu, 9 Jan 2020 10:13:37 -0500
Subject: [PATCH] Fix incorrect scoping of site variable handling

---
 xCAT-server/lib/xcat/plugins/dhcp.pm | 60 ++++++++++++++--------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index d2ae11657..f2e0b0898 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -1623,37 +1623,37 @@ sub process_request
                 }
             }
         }
-        @entries = xCAT::TableUtils->get_site_attribute("nameservers");
-        $t_entry = $entries[0];
-        if (defined($t_entry)) {
-            $sitenameservers = $t_entry;
-        }
-        @entries = xCAT::TableUtils->get_site_attribute("ntpservers");
-        $t_entry = $entries[0];
-        if (defined($t_entry)) {
-            $sitentpservers = $t_entry;
-        }
-        @entries = xCAT::TableUtils->get_site_attribute("logservers");
-        $t_entry = $entries[0];
-        if (defined($t_entry)) {
-            $sitelogservers = $t_entry;
-        }
-        @entries = xCAT::TableUtils->get_site_attribute("domain");
-        $t_entry = $entries[0];
-
-        unless (defined($t_entry))
-        {
-            # this may not be an error
-            #    $callback->(
-            #         {error => ["No domain defined in site tabe"], errorcode => [1]}
-            #         );
-            #    return;
-        } else {
-            $site_domain = $t_entry;
-        }
-
-        xCAT::MsgUtils->trace($verbose_on_off, "d", "dhcp: sitelogservers=$sitelogservers sitentpservers=$sitentpservers sitenameservers=$sitenameservers site_domain=$site_domain");
     }
+    @entries = xCAT::TableUtils->get_site_attribute("nameservers");
+    $t_entry = $entries[0];
+    if (defined($t_entry)) {
+        $sitenameservers = $t_entry;
+    }
+    @entries = xCAT::TableUtils->get_site_attribute("ntpservers");
+    $t_entry = $entries[0];
+    if (defined($t_entry)) {
+        $sitentpservers = $t_entry;
+    }
+    @entries = xCAT::TableUtils->get_site_attribute("logservers");
+    $t_entry = $entries[0];
+    if (defined($t_entry)) {
+        $sitelogservers = $t_entry;
+    }
+    @entries = xCAT::TableUtils->get_site_attribute("domain");
+    $t_entry = $entries[0];
+
+    unless (defined($t_entry))
+    {
+        # this may not be an error
+        #    $callback->(
+        #         {error => ["No domain defined in site tabe"], errorcode => [1]}
+        #         );
+        #    return;
+    } else {
+        $site_domain = $t_entry;
+    }
+
+    xCAT::MsgUtils->trace($verbose_on_off, "d", "dhcp: sitelogservers=$sitelogservers sitentpservers=$sitentpservers sitenameservers=$sitenameservers site_domain=$site_domain");
 
     @dhcpconf  = ();
     @dhcp6conf = ();