From 5007e92278c5ec68cc99cd32ddfc7965f288d41c Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 13 Aug 1999 22:43:21 +0000 Subject: [PATCH] Fix empty dn. --- servers/slapd/tools/ldif2id2children-bdb2.c | 6 ++++-- servers/slapd/tools/ldif2id2children.c | 11 +++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/servers/slapd/tools/ldif2id2children-bdb2.c b/servers/slapd/tools/ldif2id2children-bdb2.c index 367f86a08f..caa49a82a0 100644 --- a/servers/slapd/tools/ldif2id2children-bdb2.c +++ b/servers/slapd/tools/ldif2id2children-bdb2.c @@ -103,9 +103,11 @@ main( int argc, char **argv ) fprintf( stderr, "entry %ld has no dn\n", id ); } else { - (void) dn_normalize_case( val ); + if( val != NULL ) { + (void) dn_normalize_case( val ); + } key.dptr = val; - key.dsize = strlen( val ) + 1; + key.dsize = strlen( val != NULL ? val : "" ) + 1; data.dptr = (char *) &id; data.dsize = sizeof(ID); if ( ldbm_store( db->dbc_db, key, data, diff --git a/servers/slapd/tools/ldif2id2children.c b/servers/slapd/tools/ldif2id2children.c index ae07c18d83..cb60859c32 100644 --- a/servers/slapd/tools/ldif2id2children.c +++ b/servers/slapd/tools/ldif2id2children.c @@ -88,14 +88,17 @@ main( int argc, char **argv ) fprintf( stderr, "entry %ld has no dn\n", id ); } else { - (void) dn_normalize_case( val ); + if( val != NULL ) { + (void) dn_normalize_case( val ); + } #ifndef DN_INDICES key.dptr = val; - key.dsize = strlen( val ) + 1; + key.dsize = strlen( val != NULL ? val : "" ) + 1; #else - key.dsize = strlen( val ) + 2; + key.dsize = strlen( val != NULL ? val : "" ) + 2; key.dptr = ch_malloc( key.dsize ); - sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, val ); + sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, + val != NULL ? val : "" ); #endif data.dptr = (char *) &id; data.dsize = sizeof(ID); -- 2.39.5