Import nextid cleanup from devel.

[openldap] / servers / slapd / dn.c

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index bd51b3c13d9d7c8c7616517c0c2045da21f09ac1..ec57f75ec7bd1342048d643c50932aa221cfb31a 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -11,10 +11,6 @@
 
 #include "slap.h"
 
-#define DNSEPARATOR(c) (c == ',' || c == ';')
-#define SEPARATOR(c)   (c == ',' || c == ';' || c == '+')
-#define SPACE(c)       (c == ' ' || c == '\n')
-#define NEEDSESCAPE(c) (c == '\\' || c == '"')
 #define B4TYPE         0
 #define INTYPE         1
 #define B4EQUAL                2
@@ -179,7 +175,7 @@ dn_parent(
                if ( *(s + 1) == '\0' ) {
                        return( NULL );
                } else {
-                       return( strdup( s + 1 ) );
+                       return( ch_strdup( s + 1 ) );
                }
        }
 
@@ -202,11 +198,11 @@ dn_parent(
                        if ( *s == '"' )
                                inquote = 1;
                        else if ( DNSEPARATOR( *s ) )
-                               return( strdup( s + 1 ) );
+                               return( ch_strdup( s + 1 ) );
                }
        }
 
-       return( strdup("") );
+       return( ch_strdup("") );
 }
 
 /*
@@ -233,7 +229,7 @@ dn_issuffix(
                return( 0 );
        }
 
-       return( strcasecmp( dn + dnlen - suffixlen, suffix ) == 0 );
+       return( strcmp( dn + dnlen - suffixlen, suffix ) == 0 );
 }
 
 /*