From: Thomas Markwalder <tmark@isc.org>
Date: Mon, 20 Jan 2014 16:34:55 +0000 (-0500)
Subject: [3282] Removed use of std::string::back from header
X-Git-Tag: bind10-1.2.0beta1-release~91^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d38e7638f9ecafc4e0db3a6b9dcad7a808c49781;p=thirdparty%2Fkea.git

[3282] Removed use of std::string::back from header

Updated template method to use qualifyName as it should
have been. This also serves to remove use of std::string::back.
---

diff --git a/src/lib/dhcpsrv/d2_client.h b/src/lib/dhcpsrv/d2_client.h
index 00295888c8..d179387db3 100644
--- a/src/lib/dhcpsrv/d2_client.h
+++ b/src/lib/dhcpsrv/d2_client.h
@@ -375,14 +375,8 @@ D2ClientMgr::adjustDomainName(OPT& fqdn, OPT& fqdn_resp) {
     } else {
         // If the supplied name is partial, qualify it by adding the suffix.
         if (fqdn.getDomainNameType() == OPT::PARTIAL) {
-            std::ostringstream name;
-            name << fqdn.getDomainName();
-            name << "." << (d2_client_config_->getQualifyingSuffix());
-            if (d2_client_config_->getQualifyingSuffix().back() != '.') {
-                name << ".";
-            }
-
-            fqdn_resp.setDomainName(name.str(), OPT::FULL);
+            fqdn_resp.setDomainName(qualifyName(fqdn.getDomainName()),
+                                    OPT::FULL);
         }
     }
 }