X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fdntest.c;h=72d3c52febb82f4e73f4c1564564ccfcef8a84eb;hb=bb17493d31e19c47bc3a906a39ffa3d57e28aaa4;hp=99e131f5e0208d150136c58e3956935c2efcae51;hpb=0ba03b18e784cce3e5348c6f6928e141b5d625f7;p=openldap diff --git a/libraries/libldap/dntest.c b/libraries/libldap/dntest.c index 99e131f5e0..72d3c52feb 100644 --- a/libraries/libldap/dntest.c +++ b/libraries/libldap/dntest.c @@ -1,10 +1,10 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * OpenLDAP API Test + * OpenLDAP DN API Test * Written by: Pierangelo Masarati * * This program is designed to test the ldap_str2dn/ldap_dn2str @@ -12,8 +12,6 @@ */ #include "portable.h" -#include - #include #include #include @@ -33,9 +31,9 @@ int main( int argc, char *argv[] ) { int rc, i, debug = 0, f2 = 0; - unsigned flags[ 2 ] = { 0U, 0U }; - char *strin, *str, *str2, buf[ 1024 ]; - LDAPDN *dn = NULL; + unsigned flags[ 2 ] = { 0U, 0 }; + char *strin, *str = NULL, buf[ 1024 ]; + LDAPDN *dn, *dn2 = NULL; while ( 1 ) { int opt = getopt( argc, argv, "d:" ); @@ -57,8 +55,9 @@ main( int argc, char *argv[] ) if ( argc < 2 ) { fprintf( stderr, "usage: dntest [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, "\tflags-in: V3,V2,DCE,\n" ); + fprintf( stderr, "\tflags-out: V3,V2,UFN,DCE,AD,\n\n" ); + fprintf( stderr, "\t: PRETTY,PEDANTIC,NOSPACES,NOONESPACE\n\n" ); return( 0 ); } @@ -73,8 +72,8 @@ main( int argc, char *argv[] ) size_t len; fgets( buf, sizeof( buf ), stdin ); - len = strlen( buf ) - 1; - if ( len >= 0 && buf[ len ] == '\n' ) { + len = strlen( buf ); + if ( len > 0 && buf[ --len ] == '\n' ) { buf[ len ] = '\0'; } strin = buf; @@ -102,22 +101,56 @@ 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" ) ) { + flags[ i ] |= LDAP_DN_P_NOLEADTRAILSPACES; + } else if ( !strcasecmp( s, "NOONESPACE" ) ) { + flags[ i ] |= LDAP_DN_P_NOSPACEAFTERRDN; } } } } - f2 = argc > 3 ? 1 : 0; + if ( flags[ 1 ] == 0 ) + flags[ 1 ] = LDAP_DN_FORMAT_LDAPV3; + + f2 = 1; rc = ldap_str2dn( strin, &dn, flags[ 0 ] ); - if ( rc == LDAP_SUCCESS && - ldap_dn2str( dn, &str, flags[ f2 ] ) == LDAP_SUCCESS ) { - char **values, *tmp, *tmp2; + if ( rc == LDAP_SUCCESS ) { + int i; + if ( dn ) { + for ( i = 0; dn[ 0 ][ i ]; i++ ) { + LDAPRDN *rdn = dn[ 0 ][ i ]; + char *rstr = NULL; + + if ( ldap_rdn2str( rdn, &rstr, flags[ f2 ] ) ) { + fprintf( stdout, "\tldap_rdn2str() failed\n" ); + continue; + } + + fprintf( stdout, "\tldap_rdn2str() = \"%s\"\n", rstr ); + ldap_memfree( rstr ); + } + } else { + fprintf( stdout, "\tempty DN\n" ); + } + } + + str = NULL; + if ( rc == LDAP_SUCCESS && + ldap_dn2str( dn, &str, flags[ f2 ] ) == LDAP_SUCCESS ) + { + char **values, *tmp, *tmp2, *str2 = NULL; int n; + fprintf( stdout, "\nldap_dn2str(ldap_str2dn(\"%s\"))\n" + "\t= \"%s\"\n", strin, str ); + switch ( flags[ f2 ] & LDAP_DN_FORMAT_MASK ) { case LDAP_DN_FORMAT_UFN: case LDAP_DN_FORMAT_AD_CANONICAL: @@ -125,23 +158,23 @@ main( int argc, char *argv[] ) case LDAP_DN_FORMAT_LDAPV3: case LDAP_DN_FORMAT_LDAPV2: - fprintf( stdout, "\nldap_dn2str(ldap_str2dn(\"%s\"))\n" - "\t=\"%s\"\n", strin, str ); tmp = ldap_dn2ufn( strin ); - fprintf( stdout, "\nldap_dn2ufn(\"%s\")\n\t=\"%s\"\n", - strin, tmp ); + fprintf( stdout, "\nldap_dn2ufn(\"%s\")\n" + "\t= \"%s\"\n", strin, tmp ); ldap_memfree( tmp ); + tmp = ldap_dn2dcedn( strin ); fprintf( stdout, "\nldap_dn2dcedn(\"%s\")\n" - "\t=\"%s\"\n", strin, tmp ); + "\t= \"%s\"\n", strin, tmp ); tmp2 = ldap_dcedn2dn( tmp ); fprintf( stdout, "\nldap_dcedn2dn(\"%s\")\n" - "\t=\"%s\"\n", tmp, tmp2 ); + "\t= \"%s\"\n", tmp, tmp2 ); ldap_memfree( tmp ); ldap_memfree( tmp2 ); + tmp = ldap_dn2ad_canonical( strin ); fprintf( stdout, "\nldap_dn2ad_canonical(\"%s\")\n" - "\t=\"%s\"\n", strin, tmp ); + "\t= \"%s\"\n", strin, tmp ); ldap_memfree( tmp ); fprintf( stdout, "\nldap_explode_dn(\"%s\"):\n", str ); @@ -183,18 +216,59 @@ main( int argc, char *argv[] ) break; } - - rc = ldap_str2dn( str, &dn, flags[ f2 ] ); + + dn2 = NULL; + rc = ldap_str2dn( str, &dn2, flags[ f2 ] ); + str2 = NULL; if ( rc == LDAP_SUCCESS && - ldap_dn2str( dn, &str2, flags[ f2 ] ) + ldap_dn2str( dn2, &str2, flags[ f2 ] ) == LDAP_SUCCESS ) { + int iRDN; + fprintf( stdout, "\n\"%s\"\n\t == \"%s\" ? %s\n", str, str2, strcmp( str, str2 ) == 0 ? "yes" : "no" ); + + if( dn != NULL && dn2 == NULL ) { + fprintf( stdout, "dn 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[ 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 ) { + fprintf( stdout, "ava(%d), rdn(%d) attr len mismatch (%ld->%ld)\n", + iAVA + 1, iRDN + 1, + a->la_attr.bv_len, a2->la_attr.bv_len ); + } else if ( memcmp( a->la_attr.bv_val, a2->la_attr.bv_val, a->la_attr.bv_len ) ) { + fprintf( stdout, "ava(%d), rdn(%d) attr mismatch\n", + iAVA + 1, iRDN + 1 ); + } else if ( a->la_flags != a2->la_flags ) { + fprintf( stdout, "ava(%d), rdn(%d) flag mismatch (%x->%x)\n", + iAVA + 1, iRDN + 1, a->la_flags, a2->la_flags ); + } else if ( a->la_value.bv_len != a2->la_value.bv_len ) { + fprintf( stdout, "ava(%d), rdn(%d) value len mismatch (%ld->%ld)\n", + iAVA + 1, iRDN + 1, + a->la_value.bv_len, a2->la_value.bv_len ); + } else if ( memcmp( a->la_value.bv_val, a2->la_value.bv_val, a->la_value.bv_len ) ) { + fprintf( stdout, "ava(%d), rdn(%d) value mismatch\n", + iAVA + 1, iRDN + 1 ); + } + } + } + + ldap_dnfree( dn2 ); ldap_memfree( str2 ); } ldap_memfree( str ); } + ldap_dnfree( dn ); /* note: dn is not freed */