#include "portable.h"
#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include "slap.h"
-void entry_free();
-char *entry2str();
+#include <ac/ctype.h>
+#include <ac/errno.h>
+#include <ac/socket.h>
+#include <ac/string.h>
+
+#include "slap.h"
static unsigned char *ebuf; /* buf returned by entry2str */
static unsigned char *ecur; /* pointer to end of currently used ebuf */
Entry *
str2entry( char *s )
{
- int i;
+ int id = 0;
Entry *e;
Attribute **a;
char *type;
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);
-
/* 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 ) {
+ if ( isdigit( (unsigned char) *s ) ) {
+ id = atoi( s );
+ if ( (s = ldif_getline( &next )) == NULL ) {
Debug( LDAP_DEBUG_TRACE,
"<= str2entry NULL (missing newline after id)\n",
0, 0, 0 );
}
}
+ /* initialize reader/writer lock */
+ e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+
+ if( e == NULL ) {
+ Debug( LDAP_DEBUG_TRACE,
+ "<= str2entry NULL (entry allocation failed)\n",
+ 0, 0, 0 );
+ return( NULL );
+ }
+
+ e->e_id = id;
+ e->e_private = NULL;
+
/* dn + attributes */
e->e_attrs = NULL;
vals[0] = &bval;
vals[1] = NULL;
ptype[0] = '\0';
- while ( (s = str_getline( &next )) != NULL ) {
+ 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, &vlen ) != 0 ) {
Debug( LDAP_DEBUG_TRACE,
"<= str2entry NULL (parse_line)\n", 0, 0, 0 );
continue;
maxvals = 0;
a = NULL;
}
+
if ( strcasecmp( type, "dn" ) == 0 ) {
if ( e->e_dn != NULL ) {
Debug( LDAP_DEBUG_ANY,
- "str2entry: entry %d has multiple dns \"%s\" and \"%s\" (second ignored)\n",
+ "str2entry: entry %ld has multiple dns \"%s\" and \"%s\" (second ignored)\n",
e->e_id, e->e_dn, value );
continue;
}
- e->e_dn = strdup( value );
+ e->e_dn = ch_strdup( value );
+
+ if ( e->e_ndn != NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ "str2entry: entry %ld already has a normalized dn \"%s\" for \"%s\" (first ignored)\n",
+ e->e_id, e->e_ndn, value );
+ free( e->e_ndn );
+ }
+ e->e_ndn = ch_strdup( value );
+ (void) dn_normalize_case( e->e_ndn );
continue;
}
!= 0 ) {
Debug( LDAP_DEBUG_TRACE,
"<= str2entry NULL (attr_merge)\n", 0, 0, 0 );
+ entry_free( e );
return( NULL );
}
nvals++;
/* 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 );
+ if ( e->e_ndn == NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ "str2entry: entry %ld (\"%s\") has no normalized dn\n",
+ e->e_id, e->e_dn, 0 );
+ entry_free( e );
+ return( NULL );
+ }
+
+ Debug(LDAP_DEBUG_TRACE, "<= str2entry(%s) -> %ld (0x%lx)\n",
+ e->e_dn, e->e_id, (unsigned long)e );
return( e );
}
/* put "dn: <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_put_type_and_value( (char **) &ecur, "dn", e->e_dn, tmplen );
}
/* put the attributes */
bv = a->a_vals[i];
tmplen = strlen( a->a_type );
MAKE_SPACE( LDIF_SIZE_NEEDED( tmplen, bv->bv_len ));
- put_type_and_value( (char **) &ecur, a->a_type,
+ ldif_put_type_and_value( (char **) &ecur, a->a_type,
bv->bv_val, bv->bv_len );
}
}
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) );
}