Fix extensible filters

[openldap] / libraries / libldap / dntest.c

diff --git a/libraries/libldap/dntest.c b/libraries/libldap/dntest.c
index 74b0e9ada1d1c04879769c82e8252ba233a9721d..1201f1c3c9e0ebd65be3a71573233c300fa3b5b9 100644 (file)
--- a/libraries/libldap/dntest.c
+++ b/libraries/libldap/dntest.c
@@ -4,7 +4,7 @@
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
- * OpenLDAP API Test
+ * OpenLDAP DN API Test
  *      Written by: Pierangelo Masarati <ando@OpenLDAP.org>
  *
  * This program is designed to test the ldap_str2dn/ldap_dn2str
@@ -12,8 +12,6 @@
  */
 #include "portable.h"
 
-#include <stdlib.h>
-
 #include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/unistd.h>
@@ -33,7 +31,7 @@ int
 main( int argc, char *argv[] )
 {
        int             rc, i, debug = 0, f2 = 0;
-       unsigned        flags[ 2 ] = { 0U, 0U };
+       unsigned        flags[ 2 ] = { 0U, LDAP_DN_FORMAT_LDAPV3 };
        char            *strin, *str, *str2, buf[ 1024 ];
        LDAPDN          *dn, *dn2 = NULL;
 
@@ -57,9 +55,9 @@ main( int argc, char *argv[] )
 
        if ( argc < 2 ) {
                fprintf( stderr, "usage: dntest <dn> [flags-in[,...]] [flags-out[,...]]\n\n" );
-               fprintf( stderr, "\tflags-in:   V3,V2,DCE,<pedantic>\n" );
-               fprintf( stderr, "\tflags-out:  V3,V2,UFN,DCE,AD,<pedantic>\n\n" );
-               fprintf( stderr, "\t<pedantic>: PEDANTIC,NOSPACES,NOONESPACE\n\n" );
+               fprintf( stderr, "\tflags-in:   V3,V2,DCE,<flags>\n" );
+               fprintf( stderr, "\tflags-out:  V3,V2,UFN,DCE,AD,<flags>\n\n" );
+               fprintf( stderr, "\t<flags>: PRETTY,PEDANTIC,NOSPACES,NOONESPACE\n\n" );
                return( 0 );
        }
 
@@ -103,6 +101,8 @@ main( int argc, char *argv[] )
                                        flags[ i ] |= LDAP_DN_FORMAT_UFN;
                                } else if ( !strcasecmp( s, "AD" ) ) {
                                        flags[ i ] |= LDAP_DN_FORMAT_AD_CANONICAL;
+                               } else if ( !strcasecmp( s, "PRETTY" ) ) {
+                                       flags[ i ] |= LDAP_DN_PRETTY;
                                } else if ( !strcasecmp( s, "PEDANTIC" ) ) {
                                        flags[ i ] |= LDAP_DN_PEDANTIC;
                                } else if ( !strcasecmp( s, "NOSPACES" ) ) {
@@ -114,28 +114,33 @@ main( int argc, char *argv[] )
                }
        }
 
-       f2 = argc > 3 ? 1 : 0;
+       f2 = 1;
 
        rc = ldap_str2dn( strin, &dn, flags[ 0 ] );
 
        if ( rc == LDAP_SUCCESS ) {
                int i;
-               for ( i = 0; dn[ i ]; i++ ) {
-                       LDAPRDN         *rdn = dn[ i ][ 0 ];
-                       char            *rstr;
+               if( dn ) {
+                       for ( i = 0; dn[i]; i++ ) {
+                               LDAPRDN         *rdn = dn[ 0 ][ i ];
+                               char            *rstr;
+
+                               if ( ldap_rdn2str( rdn, &rstr, flags[ f2 ] ) ) {
+                                       fprintf( stdout, "\tldap_rdn2str() failed\n" );
+                                       continue;
+                               }
 
-                       if ( ldap_rdn2str( rdn, &rstr, flags[ f2 ] ) ) {
-                               fprintf( stdout, "\tldap_rdn2str() failed\n" );
-                               continue;
+                               fprintf( stdout, "\tldap_rdn2str() = \"%s\"\n", rstr );
+                               ldap_memfree( rstr );
                        }
-
-                       fprintf( stdout, "\tldap_rdn2str() = \"%s\"\n", rstr );
-                       ldap_memfree( rstr );
+               } else {
+                       fprintf( stdout, "\tempty DN\n" );
                }
        }
 
-       if ( rc == LDAP_SUCCESS && 
-                       ldap_dn2str( dn, &str, flags[ f2 ] ) == LDAP_SUCCESS ) {
+       if ( rc == LDAP_SUCCESS &&
+               ldap_dn2str( dn, &str, flags[ f2 ] ) == LDAP_SUCCESS )
+       {
                char    **values, *tmp, *tmp2;
                int     n;
                
@@ -216,31 +221,40 @@ main( int argc, char *argv[] )
                                str, str2, 
                                strcmp( str, str2 ) == 0 ? "yes" : "no" );
 
-                       for ( iRDN = 0; dn[ iRDN ] && dn2[ iRDN ]; iRDN++ ) {
-                               LDAPRDN         *r = dn[ iRDN ][ 0 ];
-                               LDAPRDN         *r2 = dn2[ iRDN ][ 0 ];
+                       if(( dn != NULL && dn2 == NULL )
+                               || ( dn != NULL && dn2 == NULL ))
+                       {
+                               fprintf( stdout, "mismatch\n" );
+                       } else if (( dn != NULL ) && (dn2 != NULL))
+                               for ( iRDN = 0; dn[ 0 ][ iRDN ] && dn2[ 0 ][ iRDN ]; iRDN++ )
+                       {
+                               LDAPRDN         *r = dn[ 0 ][ iRDN ];
+                               LDAPRDN         *r2 = dn2[ 0 ][ iRDN ];
                                int             iAVA;
                                
-                               for ( iAVA = 0; r[ iAVA ] && r[ iAVA ]; iAVA++ ) {
-                                       LDAPAVA         *a = r[ iAVA ][ 0 ];
-                                       LDAPAVA         *a2 = r2[ iAVA ][ 0 ];
-
-                                       if ( strcmp( a->la_attr, a2->la_attr )
-                                                       || a->la_flags != a2->la_flags
-                                                       || a->la_value->bv_len != a2->la_value->bv_len
-                                                       || memcmp( a->la_value->bv_val, a2->la_value->bv_val, a->la_value->bv_len ) ) {
+                               for ( iAVA = 0; r[ 0 ][ iAVA ] && r2[ 0 ][ iAVA ]; iAVA++ ) {
+                                       LDAPAVA         *a = r[ 0 ][ iAVA ];
+                                       LDAPAVA         *a2 = r2[ 0 ][ iAVA ];
+
+                                       if ( a->la_attr.bv_len != a2->la_attr.bv_len
+                                               || memcmp( a->la_attr.bv_val, a2->la_attr.bv_val,
+                                                       a->la_attr.bv_len )
+                                               || a->la_flags != a2->la_flags
+                                               || a->la_value.bv_len != a2->la_value.bv_len
+                                               || memcmp( a->la_value.bv_val, a2->la_value.bv_val,
+                                                       a->la_value.bv_len ) )
+                                       {
                                                fprintf( stdout, "mismatch\n" );
-                                               
                                        }
                                }
                        }
                        
-                       ldapava_free_dn( dn2 );
+                       ldap_dnfree( dn2 );
                        ldap_memfree( str2 );
                }
                ldap_memfree( str );
        }
-       ldapava_free_dn( dn );
+       ldap_dnfree( dn );
 
        /* note: dn is not freed */