X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fentry.c;h=1ce0a4fbc099dfd39421bab886890ccc4ff5d740;hb=e25f6ef0cdd1780577dffeaca8ba8b19b5697880;hp=70154958282d9f5b091e8ca9537b73ea4e1d5996;hpb=0c28b66a7564728d8046d7e9c9840bf3e46f79f9;p=openldap diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c index 7015495828..1ce0a4fbc0 100644 --- a/servers/slapd/entry.c +++ b/servers/slapd/entry.c @@ -1,7 +1,7 @@ /* entry.c - routines for dealing with entries */ /* $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 */ @@ -24,11 +24,11 @@ static int emaxsize;/* max size of ebuf */ /* * Empty root entry */ -const Entry slap_entry_root = { NOID, "", "", NULL, NULL }; +const Entry slap_entry_root = { NOID, { 0, "" }, { 0, "" }, NULL, NULL }; int entry_destroy(void) { - free( ebuf ); + if ( ebuf ) free( ebuf ); ebuf = NULL; ecur = NULL; emaxsize = 0; @@ -41,10 +41,8 @@ str2entry( char *s ) { int rc; Entry *e; - ber_len_t dnlen; char *type; - struct berval value; - struct berval *vals[2]; + struct berval vals[2]; AttributeDescription *ad; const char *text; char *next; @@ -66,7 +64,7 @@ str2entry( char *s ) #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, - "str2entry: \"%s\"\n", s ? s : "NULL" )); + "str2entry: \"%s\"\n", s ? s : "NULL" )); #else Debug( LDAP_DEBUG_TRACE, "=> str2entry\n", s ? s : "NULL", 0, 0 ); @@ -78,7 +76,7 @@ str2entry( char *s ) if( e == NULL ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "str2entry: entry allocation failed.\n" )); + "str2entry: entry allocation failed.\n" )); #else Debug( LDAP_DEBUG_ANY, "<= str2entry NULL (entry allocation failed)\n", @@ -89,14 +87,15 @@ str2entry( char *s ) /* initialize entry */ e->e_id = NOID; - e->e_dn = NULL; - e->e_ndn = NULL; + e->e_name.bv_val = NULL; + e->e_name.bv_len = 0; + e->e_nname.bv_val = NULL; + e->e_nname.bv_len = 0; e->e_attrs = NULL; e->e_private = NULL; /* dn + attributes */ - vals[0] = &value; - vals[1] = NULL; + vals[1].bv_val = NULL; next = s; while ( (s = ldif_getline( &next )) != NULL ) { @@ -104,7 +103,7 @@ str2entry( char *s ) break; } - if ( ldif_parse_line( s, &type, &value.bv_val, &value.bv_len ) != 0 ) { + if ( ldif_parse_line( s, &type, &vals[0].bv_val, &vals[0].bv_len ) != 0 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, "str2entry: NULL (parse_line)\n" )); @@ -116,28 +115,29 @@ str2entry( char *s ) } if ( strcasecmp( type, "dn" ) == 0 ) { - struct berval *pdn; + struct berval *pdn = NULL; free( type ); if ( e->e_dn != NULL ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, "str2entry: " - "entry %ld has multiple dns \"%s\" and \"%s\"\n", + "entry %ld has multiple DNs \"%s\" and \"%s\"\n", (long) e->e_id, e->e_dn, - value.bv_val != NULL ? value.bv_val : "" )); + vals[0].bv_val != NULL ? vals[0].bv_val : "" )); #else Debug( LDAP_DEBUG_ANY, "str2entry: " - "entry %ld has multiple dns \"%s\" and \"%s\"\n", + "entry %ld has multiple DNs \"%s\" and \"%s\"\n", (long) e->e_id, e->e_dn, - value.bv_val != NULL ? value.bv_val : "" ); + vals[0].bv_val != NULL ? vals[0].bv_val : "" ); #endif - if( value.bv_val != NULL ) free( value.bv_val ); + if( vals[0].bv_val != NULL ) free( vals[0].bv_val ); entry_free( e ); return NULL; } - rc = dnPretty( NULL, &value, &pdn ); + rc = dnPrettyNormal( NULL, &vals[0], &e->e_name, &e->e_nname ); + free( vals[0].bv_val ); if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, "str2entry: " @@ -150,14 +150,9 @@ str2entry( char *s ) (long) e->e_id, pdn->bv_val ? pdn->bv_val : "", 0 ); #endif - if( value.bv_val != NULL ) free( value.bv_val ); entry_free( e ); return NULL; } - - e->e_dn = pdn->bv_val != NULL ? pdn->bv_val : ch_strdup( "" ); - dnlen = pdn->bv_len; - free( pdn ); continue; } @@ -167,7 +162,7 @@ str2entry( char *s ) if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, - "str2entry: str2ad(%s): %s\n", type, text )); + "str2entry: str2ad(%s): %s\n", type, text )); #else Debug( slapMode & SLAP_TOOL_MODE ? LDAP_DEBUG_ANY : LDAP_DEBUG_TRACE, @@ -175,7 +170,7 @@ str2entry( char *s ) #endif if( slapMode & SLAP_TOOL_MODE ) { entry_free( e ); - free( value.bv_val ); + free( vals[0].bv_val ); free( type ); return NULL; } @@ -184,21 +179,21 @@ str2entry( char *s ) if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, - "str2entry: str2undef_ad(%s): %s\n", type, text )); + "str2entry: str2undef_ad(%s): %s\n", type, text )); #else Debug( LDAP_DEBUG_ANY, "<= str2entry: str2undef_ad(%s): %s\n", type, text, 0 ); #endif entry_free( e ); - free( value.bv_val ); + free( vals[0].bv_val ); free( type ); return NULL; } } if( slapMode & SLAP_TOOL_MODE ) { - struct berval *pval; + struct berval pval; slap_syntax_validate_func *validate = ad->ad_type->sat_syntax->ssyn_validate; slap_syntax_transform_func *pretty = @@ -206,26 +201,26 @@ str2entry( char *s ) if( pretty ) { rc = pretty( ad->ad_type->sat_syntax, - &value, &pval ); + &vals[0], &pval ); } else if( validate ) { /* * validate value per syntax */ - rc = validate( ad->ad_type->sat_syntax, &value ); + rc = validate( ad->ad_type->sat_syntax, &vals[0] ); } else { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_INFO, - "str2entry: no validator for syntax %s\n", - ad->ad_type->sat_syntax->ssyn_oid )); + "str2entry: no validator for syntax %s\n", + ad->ad_type->sat_syntax->ssyn_oid )); #else Debug( LDAP_DEBUG_ANY, "str2entry: no validator for syntax %s\n", ad->ad_type->sat_syntax->ssyn_oid, 0, 0 ); #endif entry_free( e ); - free( value.bv_val ); + free( vals[0].bv_val ); free( type ); return NULL; } @@ -233,52 +228,50 @@ str2entry( char *s ) if( rc != 0 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "str2entry: invalid value for syntax %s\n", - ad->ad_type->sat_syntax->ssyn_oid )); + "str2entry: invalid value for syntax %s\n", + ad->ad_type->sat_syntax->ssyn_oid )); #else Debug( LDAP_DEBUG_ANY, "str2entry: invalid value for syntax %s\n", ad->ad_type->sat_syntax->ssyn_oid, 0, 0 ); #endif entry_free( e ); - free( value.bv_val ); + free( vals[0].bv_val ); free( type ); return NULL; } if( pretty ) { - free( value.bv_val ); - value = *pval; - free( pval ); + free( vals[0].bv_val ); + vals[0] = pval; } } rc = attr_merge( e, ad, vals ); - if( rc != 0 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, - "str2entry: NULL (attr_merge)\n" )); + "str2entry: NULL (attr_merge)\n" )); #else Debug( LDAP_DEBUG_ANY, "<= str2entry NULL (attr_merge)\n", 0, 0, 0 ); #endif entry_free( e ); - free( value.bv_val ); + free( vals[0].bv_val ); free( type ); return( NULL ); } free( type ); - free( value.bv_val ); + free( vals[0].bv_val ); } /* check to make sure there was a dn: line */ if ( e->e_dn == NULL ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_INFO, - "str2entry: entry %ld has no dn.\n", - (long) e->e_id )); + "str2entry: entry %ld has no dn.\n", + (long) e->e_id )); #else Debug( LDAP_DEBUG_ANY, "str2entry: entry %ld has no dn\n", (long) e->e_id, 0, 0 ); @@ -287,34 +280,6 @@ str2entry( char *s ) return( NULL ); } - /* generate normalized dn */ - { - struct berval dn; - struct berval *ndn; - - dn.bv_val = e->e_dn; - dn.bv_len = dnlen; - - rc = dnNormalize( NULL, &dn, &ndn ); - - if( rc != LDAP_SUCCESS ) { -#ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, - "str2entry: entry %ld has invalid dn: %s\n", - (long) e->e_id, e->e_ndn )); -#else - Debug( LDAP_DEBUG_ANY, - "str2entry: entry %ld has invalid dn: %s\n", - (long) e->e_id, e->e_ndn, 0 ); -#endif - entry_free( e ); - return NULL; - } - - e->e_ndn = ndn->bv_val; - free( ndn ); - } - #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL2, "str2entry(%s) -> 0x%lx\n", e->e_dn, (unsigned long)e )); @@ -346,7 +311,8 @@ entry2str( { Attribute *a; struct berval *bv; - int i, tmplen; + int i; + ber_len_t tmplen; /* * In string format, an entry looks like this: @@ -359,7 +325,7 @@ entry2str( /* put the dn */ if ( e->e_dn != NULL ) { /* put "dn: " */ - tmplen = strlen( e->e_dn ); + tmplen = e->e_name.bv_len; MAKE_SPACE( LDIF_SIZE_NEEDED( 2, tmplen )); ldif_sput( (char **) &ecur, LDIF_PUT_VALUE, "dn", e->e_dn, tmplen ); } @@ -367,8 +333,8 @@ entry2str( /* put the attributes */ for ( a = e->e_attrs; a != NULL; a = a->a_next ) { /* put ":[:] " line for each value */ - for ( i = 0; a->a_vals[i] != NULL; i++ ) { - bv = a->a_vals[i]; + for ( i = 0; a->a_vals[i].bv_val != NULL; i++ ) { + bv = &a->a_vals[i]; tmplen = a->a_desc->ad_cname.bv_len; MAKE_SPACE( LDIF_SIZE_NEEDED( tmplen, bv->bv_len )); ldif_sput( (char **) &ecur, LDIF_PUT_VALUE, @@ -433,6 +399,8 @@ int entry_dn_cmp( Entry *e1, Entry *e2 ) { /* compare their normalized UPPERCASED dn's */ + int rc = e1->e_nname.bv_len - e2->e_nname.bv_len; + if (rc) return rc; return( strcmp( e1->e_ndn, e2->e_ndn ) ); } @@ -504,8 +472,8 @@ entry_getlen(unsigned char **buf) */ int entry_encode(Entry *e, struct berval *bv) { - int siz = sizeof(Entry); - int len, dnlen, ndnlen; + ber_len_t siz = sizeof(Entry); + ber_len_t len, dnlen, ndnlen; int i; Attribute *a; unsigned char *ptr; @@ -518,8 +486,8 @@ int entry_encode(Entry *e, struct berval *bv) Debug( LDAP_DEBUG_TRACE, "=> entry_encode(0x%08lx): %s\n", (long) e->e_id, e->e_dn, 0 ); #endif - dnlen = strlen(e->e_dn); - ndnlen = strlen(e->e_ndn); + dnlen = e->e_name.bv_len; + ndnlen = e->e_nname.bv_len; len = dnlen + ndnlen + 2; /* two trailing NUL bytes */ len += entry_lenlen(dnlen); len += entry_lenlen(ndnlen); @@ -528,14 +496,13 @@ int entry_encode(Entry *e, struct berval *bv) siz += sizeof(Attribute); len += a->a_desc->ad_cname.bv_len+1; len += entry_lenlen(a->a_desc->ad_cname.bv_len); - for (i=0; a->a_vals[i]; i++) { - siz += sizeof(struct berval *); + for (i=0; a->a_vals[i].bv_val; i++) { siz += sizeof(struct berval); - len += a->a_vals[i]->bv_len + 1; - len += entry_lenlen(a->a_vals[i]->bv_len); + len += a->a_vals[i].bv_len + 1; + len += entry_lenlen(a->a_vals[i].bv_len); } len += entry_lenlen(i); - siz += sizeof(struct berval *); /* NULL pointer at end */ + siz += sizeof(struct berval); /* empty berval at end */ } len += 1; /* NUL byte at end */ len += entry_lenlen(siz); @@ -544,28 +511,28 @@ int entry_encode(Entry *e, struct berval *bv) ptr = (unsigned char *)bv->bv_val; entry_putlen(&ptr, siz); entry_putlen(&ptr, dnlen); - memcpy(ptr, e->e_dn, dnlen); + AC_MEMCPY(ptr, e->e_dn, dnlen); ptr += dnlen; *ptr++ = '\0'; entry_putlen(&ptr, ndnlen); - memcpy(ptr, e->e_ndn, ndnlen); + AC_MEMCPY(ptr, e->e_ndn, ndnlen); ptr += ndnlen; *ptr++ = '\0'; for (a=e->e_attrs; a; a=a->a_next) { entry_putlen(&ptr, a->a_desc->ad_cname.bv_len); - memcpy(ptr, a->a_desc->ad_cname.bv_val, + AC_MEMCPY(ptr, a->a_desc->ad_cname.bv_val, a->a_desc->ad_cname.bv_len); ptr += a->a_desc->ad_cname.bv_len; *ptr++ = '\0'; if (a->a_vals) { - for (i=0; a->a_vals[i]; i++); + for (i=0; a->a_vals[i].bv_val; i++); entry_putlen(&ptr, i); - for (i=0; a->a_vals[i]; i++) { - entry_putlen(&ptr, a->a_vals[i]->bv_len); - memcpy(ptr, a->a_vals[i]->bv_val, - a->a_vals[i]->bv_len); - ptr += a->a_vals[i]->bv_len; + for (i=0; a->a_vals[i].bv_val; i++) { + entry_putlen(&ptr, a->a_vals[i].bv_len); + memcpy(ptr, a->a_vals[i].bv_val, + a->a_vals[i].bv_len); + ptr += a->a_vals[i].bv_len; *ptr++ = '\0'; } } @@ -594,20 +561,21 @@ int entry_decode(struct berval *bv, Entry **e) const char *text; AttributeDescription *ad; unsigned char *ptr = (unsigned char *)bv->bv_val; - struct berval **bptr; - struct berval *vptr; + BerVarray bptr; i = entry_getlen(&ptr); x = ch_malloc(i); i = entry_getlen(&ptr); - x->e_dn = ptr; + x->e_name.bv_val = ptr; + x->e_name.bv_len = i; ptr += i+1; i = entry_getlen(&ptr); - x->e_ndn = ptr; + x->e_nname.bv_val = ptr; + x->e_nname.bv_len = i; ptr += i+1; #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL2, - "entry_decode: \"%s\"\n", x->e_dn )); + "entry_decode: \"%s\"\n", x->e_dn )); #else Debug( LDAP_DEBUG_TRACE, "entry_decode: \"%s\"\n", @@ -619,31 +587,32 @@ int entry_decode(struct berval *bv, Entry **e) * pointer can never be NULL */ x->e_attrs = (Attribute *)(x+1); - bptr = (struct berval **)x->e_attrs; + bptr = (BerVarray)x->e_attrs; a = NULL; while (i = entry_getlen(&ptr)) { + struct berval bv = { i, ptr }; if (a) { a->a_next = (Attribute *)bptr; } a = (Attribute *)bptr; ad = NULL; - rc = slap_str2ad( ptr, &ad, &text ); + rc = slap_bv2ad( &bv, &ad, &text ); if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_INFO, - "entry_decode: str2ad(%s): %s\n", ptr, text )); + "entry_decode: str2ad(%s): %s\n", ptr, text )); #else Debug( LDAP_DEBUG_TRACE, "<= entry_decode: str2ad(%s): %s\n", ptr, text, 0 ); #endif - rc = slap_str2undef_ad( ptr, &ad, &text ); + rc = slap_bv2undef_ad( &bv, &ad, &text ); if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_INFO, - "entry_decode: str2undef_ad(%s): %s\n", ptr, text)); + "entry_decode: str2undef_ad(%s): %s\n", ptr, text)); #else Debug( LDAP_DEBUG_ANY, "<= entry_decode: str2undef_ad(%s): %s\n", @@ -654,29 +623,28 @@ int entry_decode(struct berval *bv, Entry **e) } ptr += i + 1; a->a_desc = ad; - bptr = (struct berval **)(a+1); + bptr = (BerVarray)(a+1); a->a_vals = bptr; + a->a_flags = 0; j = entry_getlen(&ptr); - a->a_vals[j] = NULL; - vptr = (struct berval *)(bptr + j + 1); while (j) { i = entry_getlen(&ptr); - *bptr = vptr; - vptr->bv_len = i; - vptr->bv_val = (char *)ptr; + bptr->bv_len = i; + bptr->bv_val = (char *)ptr; ptr += i+1; bptr++; - vptr++; j--; } - bptr = (struct berval **)vptr; + bptr->bv_val = NULL; + bptr->bv_len = 0; + bptr++; } if (a) a->a_next = NULL; #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, - "entry_decode: %s\n", x->e_dn )); + "entry_decode: %s\n", x->e_dn )); #else Debug(LDAP_DEBUG_TRACE, "<= entry_decode(%s)\n", x->e_dn, 0, 0 );