From: Aki Tuomi <cmouse@desteem.org>
Date: Tue, 29 Sep 2015 19:13:24 +0000 (+0300)
Subject: Fix iterator usage
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~12^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9a839fc3020e8441f462cee018cc6a7889b99ca;p=thirdparty%2Fpdns.git

Fix iterator usage

Closes several cids
---

diff --git a/modules/ldapbackend/ldapbackend.cc b/modules/ldapbackend/ldapbackend.cc
index f9a4e406cc..6d00e84bfe 100644
--- a/modules/ldapbackend/ldapbackend.cc
+++ b/modules/ldapbackend/ldapbackend.cc
@@ -269,7 +269,6 @@ void LdapBackend::lookup_tree( const QType &qtype, const DNSName &qname, DNSPack
         string filter, attr, qesc, dn;
         const char** attributes = ldap_attrany + 1;   // skip associatedDomain
         const char* attronly[] = { NULL, "dNSTTL", "modifyTimestamp", NULL };
-        vector<string>::reverse_iterator i;
         vector<string> parts;
 
 
@@ -287,7 +286,7 @@ void LdapBackend::lookup_tree( const QType &qtype, const DNSName &qname, DNSPack
         filter = strbind( ":target:", filter, getArg( "filter-lookup" ) );
 
         stringtok( parts, toLower( qname.toString() ), "." );
-        for( i = parts.rbegin(); i != parts.rend(); i++ )
+        for(auto i = parts.crbegin(); i != parts.crend(); i++ )
         {
         	dn = "dc=" + *i + "," + dn;
         }
@@ -349,8 +348,7 @@ inline bool LdapBackend::prepare_simple()
         {
         	if( m_result.count( "associatedDomain" ) )
         	{
-        		vector<string>::iterator i;
-        		for( i = m_result["associatedDomain"].begin(); i != m_result["associatedDomain"].end(); i++ ) {
+        		for(auto i = m_result["associatedDomain"].begin(); i != m_result["associatedDomain"].end(); i++ ) {
         			if( i->size() >= m_axfrqlen && i->substr( i->size() - m_axfrqlen, m_axfrqlen ) == m_qname.toString() /* ugh */ ) {
 				  m_adomains.push_back( DNSName(*i) );
         			}
@@ -379,8 +377,7 @@ inline bool LdapBackend::prepare_strict()
         {
         	if( m_result.count( "associatedDomain" ) )
         	{
-        		vector<string>::iterator i;
-        		for( i = m_result["associatedDomain"].begin(); i != m_result["associatedDomain"].end(); i++ ) {
+        		for(auto i = m_result["associatedDomain"].begin(); i != m_result["associatedDomain"].end(); i++ ) {
         			if( i->size() >= m_axfrqlen && i->substr( i->size() - m_axfrqlen, m_axfrqlen ) == m_qname.toString() /* ugh */ ) {
 				  m_adomains.push_back( DNSName(*i) );
         			}