X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fldap%2Fserv_ldap.c;h=06cf124e1d284e4aeaf89623dc8a74001e8189b1;hb=b425dda0a48b4a3e24a9f22d25e864d42679feee;hp=41c57f9d9f5dc315cbc763efb587e45db56df3d7;hpb=8b8941a7c48dfcbec1f356150990da20093d6a16;p=citadel.git

diff --git a/citadel/modules/ldap/serv_ldap.c b/citadel/modules/ldap/serv_ldap.c
index 41c57f9d9..06cf124e1 100644
--- a/citadel/modules/ldap/serv_ldap.c
+++ b/citadel/modules/ldap/serv_ldap.c
@@ -82,10 +82,13 @@ void CtdlCreateLdapRoot(void) {
 
 	/* We just want the top-level dc, not the whole hierarchy */
 	strcpy(topdc, config.c_ldap_base_dn);
-	for (i=0; i<strlen(topdc); ++i) {
-		if (topdc[i] == ',') topdc[i] = 0;
+	for (i=0; !IsEmptyStr(&topdc[i]); ++i) {
+		if (topdc[i] == ',') {
+			topdc[i] = 0;
+			break;
+		}
 	}
-	for (i=0; i<strlen(topdc); ++i) {
+	for (i=0; !IsEmptyStr(&topdc[i]); ++i) {
 		if (topdc[i] == '=') strcpy(topdc, &topdc[i+1]);
 	}