X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdn.c;h=495eca4b70b100ca944f8cd5936f41f577b17087;hb=fc49135a367e90d8fccbe9ad43c07c61340a74c7;hp=226937efa99f521a9c0cf0d6ef98deeb631f7fe7;hpb=42e0d83cb3a1a1c5b25183f1ab74ce7edbe25de7;p=openldap

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 226937efa9..495eca4b70 100644
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -1,15 +1,15 @@
 /* dn.c - routines for dealing with distinguished names */
 
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 #include "portable.h"
-#include "slap.h"
 
-static char	**dn_explode();
+#include <stdio.h>
+
+#include <ac/ctype.h>
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
+
+#include "slap.h"
 
 #define DNSEPARATOR(c)	(c == ',' || c == ';')
 #define SEPARATOR(c)	(c == ',' || c == ';' || c == '+')
@@ -179,7 +179,7 @@ dn_parent(
 		if ( *(s + 1) == '\0' ) {
 			return( NULL );
 		} else {
-			return( strdup( s + 1 ) );
+			return( ch_strdup( s + 1 ) );
 		}
 	}
 
@@ -202,11 +202,11 @@ dn_parent(
 			if ( *s == '"' )
 				inquote = 1;
 			else if ( DNSEPARATOR( *s ) )
-				return( strdup( s + 1 ) );
+				return( ch_strdup( s + 1 ) );
 		}
 	}
 
-	return( NULL );
+	return( ch_strdup("") );
 }
 
 /*