X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fdntest.c;h=e99a0570c61926216117be556f33a4c58160e76c;hb=2dfd312fa12a765a5ad311f6c9bf8dce76a63155;hp=0f92a5dc1c1c8895302299564e43c063af7db769;hpb=bf5fc54473f2143586e43aada98ae8f5dab7570b;p=openldap
diff --git a/libraries/libldap/dntest.c b/libraries/libldap/dntest.c
index 0f92a5dc1c..e99a0570c6 100644
--- a/libraries/libldap/dntest.c
+++ b/libraries/libldap/dntest.c
@@ -1,23 +1,35 @@
+/* dntest.c -- OpenLDAP DN API Test Program */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+/* ACKNOWLEDGEMENT:
+ * This program was initially developed by Pierangelo Masarati
+ * for inclusion in OpenLDAP Software.
*/
+
/*
- * OpenLDAP DN API Test
- * Written by: Pierangelo Masarati
- *
* This program is designed to test the ldap_str2dn/ldap_dn2str
* functions
*/
#include "portable.h"
+#include
+
#include
#include
#include
-#include
-
#include
#include "ldap-int.h"
@@ -31,9 +43,9 @@ int
main( int argc, char *argv[] )
{
int rc, i, debug = 0, f2 = 0;
- unsigned flags[ 2 ] = { 0U, LDAP_DN_FORMAT_LDAPV3 };
- char *strin, *str, *str2, buf[ 1024 ];
- LDAPDN *dn, *dn2 = NULL;
+ unsigned flags[ 2 ] = { 0U, 0 };
+ char *strin, *str = NULL, buf[ 1024 ];
+ LDAPDN dn, dn2 = NULL;
while ( 1 ) {
int opt = getopt( argc, argv, "d:" );
@@ -72,8 +84,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,16 +126,19 @@ main( int argc, char *argv[] )
}
}
+ if ( flags[ 1 ] == 0 )
+ flags[ 1 ] = LDAP_DN_FORMAT_LDAPV3;
+
f2 = 1;
rc = ldap_str2dn( strin, &dn, flags[ 0 ] );
if ( rc == LDAP_SUCCESS ) {
int i;
- if( dn ) {
- for ( i = 0; dn[i]; i++ ) {
- LDAPRDN *rdn = dn[ i ][ 0 ];
- char *rstr;
+ if ( dn ) {
+ for ( i = 0; dn[ i ]; i++ ) {
+ LDAPRDN rdn = dn[ i ];
+ char *rstr = NULL;
if ( ldap_rdn2str( rdn, &rstr, flags[ f2 ] ) ) {
fprintf( stdout, "\tldap_rdn2str() failed\n" );
@@ -138,10 +153,11 @@ main( int argc, char *argv[] )
}
}
+ str = NULL;
if ( rc == LDAP_SUCCESS &&
ldap_dn2str( dn, &str, flags[ f2 ] ) == LDAP_SUCCESS )
{
- char **values, *tmp, *tmp2;
+ char **values, *tmp, *tmp2, *str2 = NULL;
int n;
fprintf( stdout, "\nldap_dn2str(ldap_str2dn(\"%s\"))\n"
@@ -154,21 +170,33 @@ 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 ? tmp : "" );
+ }
+ ldap_memfree( tmp );
+
tmp = ldap_dn2ufn( strin );
fprintf( stdout, "\nldap_dn2ufn(\"%s\")\n"
- "\t= \"%s\"\n", strin, tmp );
+ "\t= \"%s\"\n", strin, tmp ? tmp : "" );
ldap_memfree( tmp );
+
tmp = ldap_dn2dcedn( strin );
fprintf( stdout, "\nldap_dn2dcedn(\"%s\")\n"
- "\t= \"%s\"\n", strin, tmp );
+ "\t= \"%s\"\n", strin, tmp ? tmp : "" );
tmp2 = ldap_dcedn2dn( tmp );
fprintf( stdout, "\nldap_dcedn2dn(\"%s\")\n"
- "\t= \"%s\"\n", tmp, tmp2 );
+ "\t= \"%s\"\n",
+ tmp ? tmp : "", tmp2 ? 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 ? tmp : "" );
ldap_memfree( tmp );
fprintf( stdout, "\nldap_explode_dn(\"%s\"):\n", str );
@@ -210,8 +238,10 @@ main( int argc, char *argv[] )
break;
}
-
+
+ dn2 = NULL;
rc = ldap_str2dn( str, &dn2, flags[ f2 ] );
+ str2 = NULL;
if ( rc == LDAP_SUCCESS &&
ldap_dn2str( dn2, &str2, flags[ f2 ] )
== LDAP_SUCCESS ) {
@@ -221,30 +251,36 @@ main( int argc, char *argv[] )
str, str2,
strcmp( str, str2 ) == 0 ? "yes" : "no" );
- if(( dn != NULL && dn2 == NULL )
- || ( dn != NULL && dn2 == NULL ))
- {
- fprintf( stdout, "mismatch\n" );
+ if( dn != NULL && dn2 == NULL ) {
+ fprintf( stdout, "dn mismatch\n" );
} else if (( dn != NULL ) && (dn2 != NULL))
for ( iRDN = 0; dn[ iRDN ] && dn2[ iRDN ]; iRDN++ )
{
- LDAPRDN *r = dn[ iRDN ][ 0 ];
- LDAPRDN *r2 = dn2[ iRDN ][ 0 ];
+ LDAPRDN r = dn[ iRDN ];
+ LDAPRDN r2 = dn2[ iRDN ];
int iAVA;
- for ( iAVA = 0; r[ iAVA ] && r[ iAVA ]; iAVA++ ) {
- LDAPAVA *a = r[ iAVA ][ 0 ];
- LDAPAVA *a2 = r2[ iAVA ][ 0 ];
-
- 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" );
+ 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 (%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 );
}
}
}