mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some minor bugs for dntest ""

Browse Source
This commit is contained in:
Kurt Zeilenga 2001-12-24 07:22:25 +00:00
parent a2c6a98427
commit 450e0d6803
2 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libraries/libldap/dntest.c
View File

@ -120,6 +120,7 @@ main( int argc, char *argv[] )
if ( rc == LDAP_SUCCESS ) { if ( rc == LDAP_SUCCESS ) {
int i; int i;
if( dn ) {
for ( i = 0; dn[i]; i++ ) { for ( i = 0; dn[i]; i++ ) {
LDAPRDN *rdn = dn[ i ][ 0 ]; LDAPRDN *rdn = dn[ i ][ 0 ];
char *rstr; char *rstr;
@ -132,10 +133,14 @@ main( int argc, char *argv[] )
fprintf( stdout, "\tldap_rdn2str() = \"%s\"\n", rstr ); fprintf( stdout, "\tldap_rdn2str() = \"%s\"\n", rstr );
ldap_memfree( rstr ); ldap_memfree( rstr );
} }
} else {
fprintf( stdout, "\tempty DN\n" );
}
} }
if ( rc == LDAP_SUCCESS && if ( rc == LDAP_SUCCESS &&
ldap_dn2str( dn, &str, flags[ f2 ] ) == LDAP_SUCCESS ) { ldap_dn2str( dn, &str, flags[ f2 ] ) == LDAP_SUCCESS )
{
char **values, *tmp, *tmp2; char **values, *tmp, *tmp2;
int n; int n;
@ -216,7 +221,13 @@ main( int argc, char *argv[] )
str, str2, str, str2,
strcmp( str, str2 ) == 0 ? "yes" : "no" ); strcmp( str, str2 ) == 0 ? "yes" : "no" );
for ( iRDN = 0; dn[ iRDN ] && dn2[ iRDN ]; iRDN++ ) { if(( dn != NULL && dn2 == NULL )
|| ( dn != NULL && dn2 == NULL ))
{
fprintf( stdout, "mismatch\n" );
} else if (( dn != NULL ) && (dn2 != NULL))
for ( iRDN = 0; dn[ iRDN ] && dn2[ iRDN ]; iRDN++ )
{
LDAPRDN *r = dn[ iRDN ][ 0 ]; LDAPRDN *r = dn[ iRDN ][ 0 ];
LDAPRDN *r2 = dn2[ iRDN ][ 0 ]; LDAPRDN *r2 = dn2[ iRDN ][ 0 ];
int iAVA; int iAVA;
@ -226,12 +237,14 @@ main( int argc, char *argv[] )
LDAPAVA *a2 = r2[ iAVA ][ 0 ]; LDAPAVA *a2 = r2[ iAVA ][ 0 ];
if ( a->la_attr->bv_len != a2->la_attr->bv_len 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 ) || memcmp( a->la_attr->bv_val, a2->la_attr->bv_val,
a->la_attr->bv_len )
|| a->la_flags != a2->la_flags || a->la_flags != a2->la_flags
|| a->la_value->bv_len != a2->la_value->bv_len || 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 ) ) { || memcmp( a->la_value->bv_val, a2->la_value->bv_val,
a->la_value->bv_len ) )
{
fprintf( stdout, "mismatch\n" ); fprintf( stdout, "mismatch\n" );
} }
} }
} }

18
libraries/libldap/getdn.c
View File

@ -141,7 +141,15 @@ ldap_explode_dn( LDAP_CONST char *dn, int notypes )
if ( ldap_str2dn( dn, &tmpDN, LDAP_DN_FORMAT_LDAP ) if ( ldap_str2dn( dn, &tmpDN, LDAP_DN_FORMAT_LDAP )
!= LDAP_SUCCESS ) { != LDAP_SUCCESS ) {
return( NULL ); return NULL;
}
if( tmpDN == NULL ) {
values = LDAP_MALLOC( sizeof( char * ) );
if( values == NULL ) return NULL;
values[0] = NULL;
return values;
} }
for ( iRDN = 0; tmpDN[ iRDN ]; iRDN++ ) { for ( iRDN = 0; tmpDN[ iRDN ]; iRDN++ ) {
@ -149,18 +157,18 @@ ldap_explode_dn( LDAP_CONST char *dn, int notypes )
ldap_rdn2str( tmpDN[ iRDN ][ 0 ], &str, flag ); ldap_rdn2str( tmpDN[ iRDN ][ 0 ], &str, flag );
v = LDAP_REALLOC( values, sizeof( char * ) * ( 2 + iRDN ) ); v = LDAP_REALLOC( values, sizeof( char * ) * ( iRDN + 1 ) );
if ( v == NULL ) { if ( v == NULL ) {
LBER_VFREE( values ); LBER_VFREE( values );
ldap_dnfree( tmpDN ); ldap_dnfree( tmpDN );
return( NULL ); return NULL;
} }
values = v; values = v;
values[ iRDN ] = str; values[ iRDN ] = str;
} }
values[ iRDN ] = NULL;
return( values ); values[ iRDN ] = NULL;
return values;
} }
char ** char **