X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fdntest.c;h=65acefa1e08709af626f53ff2cb73ef975fb31b7;hb=6f632af4132d81e2c70466b539349b19c5d46f69;hp=913cb55f50f2ff0737cb02715216685a0d56614e;hpb=9d6ebd822eaddc8ea6488486f6789b6703f8e693;p=openldap

diff --git a/libraries/libldap/dntest.c b/libraries/libldap/dntest.c
index 913cb55f50..65acefa1e0 100644
--- a/libraries/libldap/dntest.c
+++ b/libraries/libldap/dntest.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -12,12 +12,12 @@
  */
 #include "portable.h"
 
+#include <stdio.h>
+
 #include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/unistd.h>
 
-#include <stdio.h>
-
 #include <ldap.h>
 
 #include "ldap-int.h"
@@ -31,9 +31,9 @@ int
 main( int argc, char *argv[] )
 {
 	int 		rc, i, debug = 0, f2 = 0;
-	unsigned 	flags[ 2 ] = { 0U, LDAP_DN_FORMAT_LDAPV3 };
+	unsigned 	flags[ 2 ] = { 0U, 0 };
 	char		*strin, *str = NULL, buf[ 1024 ];
-	LDAPDN		*dn, *dn2 = NULL;
+	LDAPDN		dn, dn2 = NULL;
 
 	while ( 1 ) {
 		int opt = getopt( argc, argv, "d:" );
@@ -72,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;
@@ -114,6 +114,9 @@ main( int argc, char *argv[] )
 		}
 	}
 
+	if ( flags[ 1 ] == 0 )
+		flags[ 1 ] = LDAP_DN_FORMAT_LDAPV3;
+
 	f2 = 1;
 
 	rc = ldap_str2dn( strin, &dn, flags[ 0 ] );
@@ -121,8 +124,8 @@ main( int argc, char *argv[] )
 	if ( rc == LDAP_SUCCESS ) {
 		int i;
 		if ( dn ) {
-			for ( i = 0; dn[ 0 ][ i ]; i++ ) {
-				LDAPRDN		*rdn = dn[ 0 ][ i ];
+			for ( i = 0; dn[ i ]; i++ ) {
+				LDAPRDN		rdn = dn[ i ];
 				char		*rstr = NULL;
 
 				if ( ldap_rdn2str( rdn, &rstr, flags[ f2 ] ) ) {
@@ -155,6 +158,15 @@ main( int argc, char *argv[] )
 
 		case LDAP_DN_FORMAT_LDAPV3:
 		case LDAP_DN_FORMAT_LDAPV2:
+			n = ldap_dn2domain( strin, &tmp );
+			if( n ) {
+				fprintf( stdout, "\nldap_dn2domain(\"%s\") FAILED\n", strin );
+			} else {
+				fprintf( stdout, "\nldap_dn2domain(\"%s\")\n"
+					"\t= \"%s\"\n", strin, tmp );
+			}
+			ldap_memfree( tmp );
+
 			tmp = ldap_dn2ufn( strin );
 			fprintf( stdout, "\nldap_dn2ufn(\"%s\")\n"
 					"\t= \"%s\"\n", strin, tmp );
@@ -229,18 +241,18 @@ main( int argc, char *argv[] )
 			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++ )
+				for ( iRDN = 0; dn[ iRDN ] && dn2[ iRDN ]; iRDN++ )
 			{
-				LDAPRDN 	*r = dn[ 0 ][ iRDN ];
-				LDAPRDN 	*r2 = dn2[ 0 ][ iRDN ];
+				LDAPRDN 	r = dn[ iRDN ];
+				LDAPRDN 	r2 = dn2[ iRDN ];
 				int 		iAVA;
 				
-				for ( iAVA = 0; r[ 0 ][ iAVA ] && r2[ 0 ][ iAVA ]; iAVA++ ) {
-					LDAPAVA		*a = r[ 0 ][ iAVA ];
-					LDAPAVA		*a2 = r2[ 0 ][ iAVA ];
+				for ( iAVA = 0; r[ iAVA ] && r2[ iAVA ]; iAVA++ ) {
+					LDAPAVA		*a = r[ iAVA ];
+					LDAPAVA		*a2 = r2[ iAVA ];
 
 					if ( a->la_attr.bv_len != a2->la_attr.bv_len ) {
-						fprintf( stdout, "ava(%d), rdn(%d) attr len mismatch (%d->%d)\n", 
+						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 ) ) {
@@ -250,7 +262,7 @@ main( int argc, char *argv[] )
 						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 (%d->%d)\n", 
+						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 ) ) {