Fix up NT port after thread changes

[openldap] / libraries / libldap / getdn.c

diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c
index 01852c6ef89d627b1c900292c286018140290f50..0d8b488e19ac18c35e24fba7a0161fb22cd04322 100644 (file)
--- a/libraries/libldap/getdn.c
+++ b/libraries/libldap/getdn.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -63,12 +63,9 @@ ldap_dn2ufn( LDAP_CONST char *dn )
                return NULL;
        }
 
-       if ( ldap_is_dns_dn( dn ) ||
-               ( p = ldap_utf8_strpbrk( dn, "=" ) ) == NULL )
-       {
+       if ( ( p = ldap_utf8_strpbrk( dn, "=" ) ) == NULL ) {
                return( LDAP_STRDUP( dn ) );
        }
-
        ufn = LDAP_STRDUP( ++p );
 
        if( ufn == NULL ) return NULL;
@@ -141,58 +138,11 @@ ldap_dn2ufn( LDAP_CONST char *dn )
        return( ufn );
 }
 
-char **
-ldap_explode_dns( LDAP_CONST char *dn_in )
-{
-       char    *s;
-       char    **rdns;
-       char    *tok_r;
-       char    *dn;
-
-       int ncomps;
-       int maxcomps = 8;
-
-       if ( (dn = LDAP_STRDUP( dn_in )) == NULL ) {
-               return( NULL );
-       }
-
-       if ( (rdns = (char **) LDAP_MALLOC( maxcomps * sizeof(char *) )) == NULL ) {
-               LDAP_FREE( dn );
-               return( NULL );
-       }
-
-       ncomps = 0;
-       for ( s = ldap_pvt_strtok( dn, "@.", &tok_r ); s != NULL; 
-             s = ldap_pvt_strtok( NULL, "@.", &tok_r ) )
-       {
-               if ( ncomps == maxcomps ) {
-                       maxcomps *= 2;
-                       if ( (rdns = (char **) LDAP_REALLOC( rdns, maxcomps *
-                           sizeof(char *) )) == NULL )
-                       {
-                               LDAP_FREE( dn );
-                               return NULL;
-                       }
-               }
-               rdns[ncomps++] = LDAP_STRDUP( s );
-       }
-       LDAP_FREE(dn);
-
-       rdns[ncomps] = NULL;
-
-       /* trim rdns */
-       rdns = (char **) LDAP_REALLOC( rdns, (ncomps+1) * sizeof(char*) );
-       return( rdns );
-}
-
 char **
 ldap_explode_dn( LDAP_CONST char *dn, int notypes )
 {
        Debug( LDAP_DEBUG_TRACE, "ldap_explode_dn\n", 0, 0, 0 );
 
-       if ( ldap_is_dns_dn( dn ) ) {
-               return( ldap_explode_dns( dn ) );
-       }
        return explode_name( dn, notypes, NAME_TYPE_LDAP_DN );
 }
 
@@ -325,7 +275,7 @@ explode_name( const char *name, int notypes, int is_type )
                                state = INQUOTE;
                        break;
                case '=':
-                       if( state = OUTQUOTE ) have_equals++;
+                       if( state == OUTQUOTE ) have_equals++;
                        break;
                case '+':
                        if (is_type == NAME_TYPE_LDAP_RDN)
@@ -415,11 +365,3 @@ explode_name( const char *name, int notypes, int is_type )
 
        return( parts );
 }
-
-
-int
-ldap_is_dns_dn( LDAP_CONST char *dn )
-{
-       return dn[ 0 ] != '\0' && ldap_utf8_strpbrk( dn, "=,;" ) == NULL;
-}
-