X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fentry.c;h=dd9a95918eb4d7a7af4acf1ae2205c79e0f6309b;hb=a5ee438c9394a19a241716d3d922299c20b0365d;hp=72ef4b168452dac77cf2d763c1ad4dbe3bfd487b;hpb=76ed17f7942d4e3810fa90b46143e615af311167;p=openldap diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c index 72ef4b1684..dd9a95918e 100644 --- a/servers/slapd/entry.c +++ b/servers/slapd/entry.c @@ -1,37 +1,58 @@ /* entry.c - routines for dealing with entries */ +/* $OpenLDAP$ */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ + +#include "portable.h" #include -#include -#include -#include -#include -#include "slap.h" -void entry_free(); -char *entry2str(); +#include +#include +#include +#include + +#include "slap.h" static unsigned char *ebuf; /* buf returned by entry2str */ static unsigned char *ecur; /* pointer to end of currently used ebuf */ static int emaxsize;/* max size of ebuf */ +int entry_destroy(void) +{ + free( ebuf ); + ebuf = NULL; + ecur = NULL; + emaxsize = 0; + return 0; +} + + Entry * -str2entry( char *s ) +str2entry( char *s ) { - int i; + int rc; Entry *e; - Attribute **a; + Attribute **a = NULL; char *type; - char *value; - char *next; - int vlen, nvals, maxvals; - struct berval bval; + struct berval value; struct berval *vals[2]; - char ptype[64]; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + AttributeDescription *ad; + const char *text; +#else + int nvals = 0; + int maxvals = 0; + char ptype[64]; /* fixed size buffer */ +#endif + char *next; /* - * In string format, an entry looks like this: + * LDIF is used as the string format. + * An entry looks like this: * - * \n * dn: \n * [:[:] \n] * [\n]* @@ -46,98 +67,139 @@ str2entry( char *s ) Debug( LDAP_DEBUG_TRACE, "=> str2entry\n", s ? s : "NULL", 0, 0 ); - e = (Entry *) ch_calloc( 1, sizeof(Entry) ); /* initialize reader/writer lock */ - entry_rdwr_init(e); + e = (Entry *) ch_malloc( sizeof(Entry) ); - /* check to see if there's an id included */ - next = s; - if ( isdigit( *s ) ) { - e->e_id = atoi( s ); - if ( (s = str_getline( &next )) == NULL ) { - Debug( LDAP_DEBUG_TRACE, - "<= str2entry NULL (missing newline after id)\n", - 0, 0, 0 ); - return( NULL ); - } + if( e == NULL ) { + Debug( LDAP_DEBUG_TRACE, + "<= str2entry NULL (entry allocation failed)\n", + 0, 0, 0 ); + return( NULL ); } - /* dn + attributes */ + /* initialize entry */ + e->e_id = NOID; + e->e_dn = NULL; + e->e_ndn = NULL; e->e_attrs = NULL; - vals[0] = &bval; + e->e_private = NULL; + + /* dn + attributes */ + vals[0] = &value; vals[1] = NULL; +#ifndef SLAPD_SCHEMA_NOT_COMPAT ptype[0] = '\0'; - while ( (s = str_getline( &next )) != NULL ) { +#endif + + next = s; + while ( (s = ldif_getline( &next )) != NULL ) { if ( *s == '\n' || *s == '\0' ) { break; } - if ( str_parse_line( s, &type, &value, &vlen ) != 0 ) { + if ( ldif_parse_line( s, &type, &value.bv_val, &value.bv_len ) != 0 ) { Debug( LDAP_DEBUG_TRACE, "<= str2entry NULL (parse_line)\n", 0, 0, 0 ); continue; } +#ifndef SLAPD_SCHEMA_NOT_COMPAT if ( strcasecmp( type, ptype ) != 0 ) { strncpy( ptype, type, sizeof(ptype) - 1 ); nvals = 0; maxvals = 0; a = NULL; } + +#endif if ( strcasecmp( type, "dn" ) == 0 ) { + free( type ); + if ( e->e_dn != NULL ) { Debug( LDAP_DEBUG_ANY, - "str2entry: entry %d has multiple dns \"%s\" and \"%s\" (second ignored)\n", - e->e_id, e->e_dn, value ); + "str2entry: entry %ld has multiple dns \"%s\" and \"%s\" (second ignored)\n", + e->e_id, e->e_dn, + value.bv_val != NULL ? value.bv_val : "" ); + if( value.bv_val != NULL ) free( value.bv_val ); continue; } - e->e_dn = strdup( value ); + + e->e_dn = value.bv_val != NULL ? value.bv_val : ch_strdup( "" ); continue; } - bval.bv_val = value; - bval.bv_len = vlen; - if ( attr_merge_fast( e, type, vals, nvals, 1, &maxvals, &a ) - != 0 ) { +#ifdef SLAPD_SCHEMA_NOT_COMPAT + ad = NULL; + rc = slap_str2ad( type, &ad, &text ); + + if( rc != LDAP_SUCCESS ) { + Debug( LDAP_DEBUG_TRACE, + "<= str2entry NULL (str2ad=%s)\n", text, 0, 0 ); + entry_free( e ); + free( value.bv_val ); + free( type ); + return( NULL ); + } + + rc = attr_merge( e, ad, vals ); + + ad_free( ad, 1 ); +#else + rc = attr_merge_fast( e, type, vals, nvals, 1, &maxvals, &a ); +#endif + + if( rc != 0 ) { Debug( LDAP_DEBUG_TRACE, "<= str2entry NULL (attr_merge)\n", 0, 0, 0 ); + entry_free( e ); + free( value.bv_val ); + free( type ); return( NULL ); } + + free( type ); + free( value.bv_val ); +#ifndef SLAPD_SCHEMA_NOT_COMPAT nvals++; +#endif } /* check to make sure there was a dn: line */ if ( e->e_dn == NULL ) { - Debug( LDAP_DEBUG_ANY, "str2entry: entry %d has no dn\n", + Debug( LDAP_DEBUG_ANY, "str2entry: entry %ld has no dn\n", e->e_id, 0, 0 ); entry_free( e ); return( NULL ); } - Debug( LDAP_DEBUG_TRACE, "<= str2entry 0x%x\n", e, 0, 0 ); + /* generate normalized dn */ + e->e_ndn = ch_strdup( e->e_dn ); + (void) dn_normalize( e->e_ndn ); + + Debug(LDAP_DEBUG_TRACE, "<= str2entry(%s) -> %ld (0x%lx)\n", + e->e_dn, e->e_id, (unsigned long)e ); return( e ); } + #define GRABSIZE BUFSIZ #define MAKE_SPACE( n ) { \ while ( ecur + (n) > ebuf + emaxsize ) { \ - int offset; \ + ptrdiff_t offset; \ offset = (int) (ecur - ebuf); \ ebuf = (unsigned char *) ch_realloc( (char *) ebuf, \ emaxsize + GRABSIZE ); \ emaxsize += GRABSIZE; \ ecur = ebuf + offset; \ } \ -} + } char * entry2str( Entry *e, - int *len, - int printid -) + int *len ) { Attribute *a; struct berval *bv; @@ -145,26 +207,18 @@ entry2str( /* * In string format, an entry looks like this: - * \n * dn: \n * [: \n]* */ ecur = ebuf; - if ( printid ) { - /* id + newline */ - MAKE_SPACE( 10 ); - sprintf( (char *) ecur, "%ld\n", e->e_id ); - ecur = (unsigned char *) strchr( (char *) ecur, '\0' ); - } - /* put the dn */ if ( e->e_dn != NULL ) { /* put "dn: " */ tmplen = strlen( e->e_dn ); MAKE_SPACE( LDIF_SIZE_NEEDED( 2, tmplen )); - put_type_and_value( (char **) &ecur, "dn", e->e_dn, tmplen ); + ldif_sput( (char **) &ecur, LDIF_PUT_VALUE, "dn", e->e_dn, tmplen ); } /* put the attributes */ @@ -172,9 +226,18 @@ entry2str( /* put ":[:] " line for each value */ for ( i = 0; a->a_vals[i] != NULL; i++ ) { bv = a->a_vals[i]; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + tmplen = a->a_desc->ad_cname->bv_len; +#else tmplen = strlen( a->a_type ); +#endif MAKE_SPACE( LDIF_SIZE_NEEDED( tmplen, bv->bv_len )); - put_type_and_value( (char **) &ecur, a->a_type, + ldif_sput( (char **) &ecur, LDIF_PUT_VALUE, +#ifdef SLAPD_SCHEMA_NOT_COMPAT + a->a_desc->ad_cname->bv_val, +#else + a->a_type, +#endif bv->bv_val, bv->bv_len ); } } @@ -188,72 +251,54 @@ entry2str( void entry_free( Entry *e ) { - int i; Attribute *a, *next; - /* XXX check that no reader/writer locks exist */ - assert( !pthread_rdwr_wchk_np(&e->e_rdwr) && - !pthread_rdwr_rchk_np(&e->e_rdwr) ); - if ( e->e_dn != NULL ) { free( e->e_dn ); + e->e_dn = NULL; + } + if ( e->e_ndn != NULL ) { + free( e->e_ndn ); + e->e_ndn = NULL; } for ( a = e->e_attrs; a != NULL; a = next ) { next = a->a_next; attr_free( a ); } + e->e_attrs = NULL; + e->e_private = NULL; free( e ); } -int -entry_rdwr_lock(Entry *e, int rw) -{ - Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%slock: ID: %ld\n", - rw ? "w" : "r", e->e_id, 0); - if (rw) - return pthread_rdwr_wlock_np(&e->e_rdwr); - else - return pthread_rdwr_rlock_np(&e->e_rdwr); -} - -int -entry_rdwr_rlock(Entry *e) -{ - return entry_rdwr_lock( e, 0 ); -} - -int -entry_rdwr_wlock(Entry *e) -{ - return entry_rdwr_lock( e, 1 ); -} - -int -entry_rdwr_unlock(Entry *e, int rw) -{ - Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%sunlock: ID: %ld\n", - rw ? "w" : "r", e->e_id, 0); - if (rw) - return pthread_rdwr_wunlock_np(&e->e_rdwr); - else - return pthread_rdwr_runlock_np(&e->e_rdwr); -} +/* + * These routines are used only by Backend. + * + * the Entry has three entry points (ways to find things): + * + * by entry e.g., if you already have an entry from the cache + * and want to delete it. (really by entry ptr) + * by dn e.g., when looking for the base object of a search + * by id e.g., for search candidates + * + * these correspond to three different avl trees that are maintained. + */ int -entry_rdwr_runlock(Entry *e) +entry_cmp( Entry *e1, Entry *e2 ) { - return entry_rdwr_unlock( e, 0 ); + return( e1 < e2 ? -1 : (e1 > e2 ? 1 : 0) ); } int -entry_rdwr_wunlock(Entry *e) +entry_dn_cmp( Entry *e1, Entry *e2 ) { - return entry_rdwr_unlock( e, 1 ); + /* compare their normalized UPPERCASED dn's */ + return( strcmp( e1->e_ndn, e2->e_ndn ) ); } int -entry_rdwr_init(Entry *e) +entry_id_cmp( Entry *e1, Entry *e2 ) { - return pthread_rdwr_init_np(&e->e_rdwr, NULL); + return( e1->e_id < e2->e_id ? -1 : (e1->e_id > e2->e_id ? 1 : 0) ); }