X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ldapauth.cpp;h=eee357ec0796dc2e7d290b5044e127340831e79d;hb=4bb972550e79292c5571714103780d873f5e82aa;hp=b77193e9d202148c7a022b94fef932fa8e744625;hpb=a4f222ee1b05e2fdb2744c1694f9140f8099b009;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp
index b77193e9d..eee357ec0 100644
--- a/src/modules/m_ldapauth.cpp
+++ b/src/modules/m_ldapauth.cpp
@@ -64,7 +64,7 @@ class BindInterface : public LDAPInterface
 				while (i < text.length() - 1 && isalpha(text[i + 1]))
 					++i;
 
-				std::string key = text.substr(start, (i - start) + 1);
+				std::string key(start, (i - start) + 1);
 				result.append(replacements[key]);
 			}
 			else
@@ -90,8 +90,8 @@ class BindInterface : public LDAPInterface
 				if (pos == std::string::npos) // malformed
 					continue;
 
-				std::string key = dnPart.substr(0, pos);
-				std::string value = dnPart.substr(pos + 1, dnPart.length() - pos + 1); // +1s to skip the = itself
+				std::string key(dnPart, 0, pos);
+				std::string value(dnPart, pos + 1, dnPart.length() - pos + 1); // +1s to skip the = itself
 				dnParts[key] = value;
 			}
 
@@ -232,8 +232,7 @@ class SearchInterface : public LDAPInterface
 			std::string bindDn = a.get("dn");
 			if (bindDn.empty())
 			{
-				if (user)
-					ServerInstance->Users->QuitUser(user, killreason);
+				ServerInstance->Users->QuitUser(user, killreason);
 				delete this;
 				return;
 			}