X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fentry.c;h=37c72c3cb2c9d05f162135228e9097ca6eec1109;hb=9647ccd9456b8781066dbba5a063bf6c6c9dab6d;hp=b07ad02b4327eb73e0aa5e43109e1757d5fc864b;hpb=416aeb9347609866126a71de112afdefdff829bf;p=openldap
diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index b07ad02b43..37c72c3cb2 100644
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -1,8 +1,27 @@
/* entry.c - routines for dealing with entries */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
*/
#include "portable.h"
@@ -24,7 +43,9 @@ static int emaxsize;/* max size of ebuf */
/*
* Empty root entry
*/
-const Entry slap_entry_root = { NOID, { 0, "" }, { 0, "" }, NULL, 0, { 0, "" }, NULL };
+const Entry slap_entry_root = {
+ NOID, { 0, "" }, { 0, "" }, NULL, 0, { 0, "" }, NULL
+};
int entry_destroy(void)
{
@@ -43,6 +64,7 @@ str2entry( char *s )
Entry *e;
char *type;
struct berval vals[2];
+ struct berval nvals[2], *nvalsp;
AttributeDescription *ad;
const char *text;
char *next;
@@ -63,9 +85,10 @@ str2entry( char *s )
*/
#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, DETAIL1, "str2entry: \"%s\"\n", s ? s : "NULL", 0, 0 );
+ LDAP_LOG( OPERATION, DETAIL1, "str2entry: \"%s\"\n",
+ s ? s : "NULL", 0, 0 );
#else
- Debug( LDAP_DEBUG_TRACE, "=> str2entry\n",
+ Debug( LDAP_DEBUG_TRACE, "=> str2entry: \"%s\"\n",
s ? s : "NULL", 0, 0 );
#endif
@@ -87,6 +110,7 @@ str2entry( char *s )
e->e_id = NOID;
/* dn + attributes */
+ vals[1].bv_len = 0;
vals[1].bv_val = NULL;
next = s;
@@ -123,7 +147,7 @@ str2entry( char *s )
return NULL;
}
- rc = dnPrettyNormal( NULL, &vals[0], &e->e_name, &e->e_nname );
+ rc = dnPrettyNormal( NULL, &vals[0], &e->e_name, &e->e_nname, NULL );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, DETAIL1,
@@ -187,7 +211,7 @@ str2entry( char *s )
if( pretty ) {
rc = pretty( ad->ad_type->sat_syntax,
- &vals[0], &pval );
+ &vals[0], &pval, NULL );
} else if( validate ) {
/*
@@ -214,12 +238,12 @@ str2entry( char *s )
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
- "str2entry: invalid value for syntax %s\n",
- ad->ad_type->sat_syntax->ssyn_oid, 0, 0 );
+ "str2entry: invalid value for attribute %s (syntax %s)\n",
+ ad->ad_cname.bv_val, ad->ad_type->sat_syntax->ssyn_oid, 0 );
#else
Debug( LDAP_DEBUG_ANY,
- "str2entry: invalid value for syntax %s\n",
- ad->ad_type->sat_syntax->ssyn_oid, 0, 0 );
+ "str2entry: invalid value for attribute %s (syntax %s)\n",
+ ad->ad_cname.bv_val, ad->ad_type->sat_syntax->ssyn_oid, 0 );
#endif
entry_free( e );
free( vals[0].bv_val );
@@ -233,7 +257,40 @@ str2entry( char *s )
}
}
- rc = attr_merge( e, ad, vals );
+ nvalsp = NULL;
+ nvals[0].bv_val = NULL;
+
+ if( ad->ad_type->sat_equality &&
+ ad->ad_type->sat_equality->smr_normalize )
+ {
+ rc = ad->ad_type->sat_equality->smr_normalize(
+ SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+ ad->ad_type->sat_syntax,
+ ad->ad_type->sat_equality,
+ &vals[0], &nvals[0], NULL );
+
+ if( rc ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, DETAIL1,
+ "str2entry: NULL (smr_normalize %d)\n" , rc, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "<= str2entry NULL (smr_normalize %d)\n", rc, 0, 0 );
+#endif
+
+ entry_free( e );
+ free( vals[0].bv_val );
+ free( type );
+ return NULL;
+ }
+
+ nvals[1].bv_len = 0;
+ nvals[1].bv_val = NULL;
+
+ nvalsp = &nvals[0];
+ }
+
+ rc = attr_merge( e, ad, vals, nvalsp );
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, DETAIL1,
@@ -250,6 +307,7 @@ str2entry( char *s )
free( type );
free( vals[0].bv_val );
+ free( nvals[0].bv_val );
}
/* check to make sure there was a dn: line */
@@ -262,7 +320,7 @@ str2entry( char *s )
(long) e->e_id, 0, 0 );
#endif
entry_free( e );
- return( NULL );
+ return NULL;
}
#ifdef NEW_LOGGING
@@ -384,26 +442,28 @@ entry_free( Entry *e )
int
entry_cmp( Entry *e1, Entry *e2 )
{
- return( e1 < e2 ? -1 : (e1 > e2 ? 1 : 0) );
+ return SLAP_PTRCMP( e1, e2 );
}
int
-entry_dn_cmp( Entry *e1, Entry *e2 )
+entry_dn_cmp( const void *v_e1, const void *v_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 ) );
+ const Entry *e1 = v_e1, *e2 = v_e2;
+
+ return ber_bvcmp( &e1->e_nname, &e2->e_nname );
}
int
-entry_id_cmp( Entry *e1, Entry *e2 )
+entry_id_cmp( const void *v_e1, const void *v_e2 )
{
+ const Entry *e1 = v_e1, *e2 = v_e2;
return( e1->e_id < e2->e_id ? -1 : (e1->e_id > e2->e_id ? 1 : 0) );
}
-#ifdef SLAPD_BDB
-
+#define entry_lenlen(l) ((l) < 0x80) ? 1 : ((l) < 0x100) ? 2 : \
+ ((l) < 0x10000) ? 3 : ((l) < 0x1000000) ? 4 : 5
+#if 0
/* This is like a ber_len */
static ber_len_t
entry_lenlen(ber_len_t len)
@@ -418,6 +478,7 @@ entry_lenlen(ber_len_t len)
return 4;
return 5;
}
+#endif
static void
entry_putlen(unsigned char **buf, ber_len_t len)
@@ -455,6 +516,52 @@ entry_getlen(unsigned char **buf)
return len;
}
+/* Add up the size of the entry for a flattened buffer */
+void entry_flatsize(Entry *e, ber_len_t *psiz, ber_len_t *plen, int norm)
+{
+ ber_len_t siz = sizeof(Entry);
+ ber_len_t len, dnlen, ndnlen;
+ int i;
+ Attribute *a;
+
+ dnlen = e->e_name.bv_len;
+ len = dnlen + 1; /* trailing NUL byte */
+ len += entry_lenlen(dnlen);
+ if (norm) {
+ ndnlen = e->e_nname.bv_len;
+ len += ndnlen + 1;
+ len += entry_lenlen(ndnlen);
+ }
+ for (a=e->e_attrs; a; a=a->a_next) {
+ /* For AttributeDesc, we only store the attr name */
+ 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].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 += entry_lenlen(i);
+ siz += sizeof(struct berval); /* empty berval at end */
+ if (norm && a->a_nvals != a->a_vals) {
+ for (i=0; a->a_nvals[i].bv_val; i++) {
+ siz += sizeof(struct berval);
+ len += a->a_nvals[i].bv_len + 1;
+ len += entry_lenlen(a->a_nvals[i].bv_len);
+ }
+ len += entry_lenlen(i); /* i nvals */
+ siz += sizeof(struct berval);
+ } else {
+ len += entry_lenlen(0); /* 0 nvals */
+ }
+ }
+ len += 1; /* NUL byte at end */
+ len += entry_lenlen(siz);
+ *psiz = siz;
+ *plen = len;
+}
+
/* Flatten an Entry into a buffer. The buffer is filled with just the
* strings/bervals of all the entry components. Each field is preceded
* by its length, encoded the way ber_put_len works. Every field is NUL
@@ -479,24 +586,9 @@ int entry_encode(Entry *e, struct berval *bv)
#endif
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);
- for (a=e->e_attrs; a; a=a->a_next) {
- /* For AttributeDesc, we only store the attr name */
- 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].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 += entry_lenlen(i);
- siz += sizeof(struct berval); /* empty berval at end */
- }
- len += 1; /* NUL byte at end */
- len += entry_lenlen(siz);
+
+ entry_flatsize( e, &siz, &len, 1 );
+
bv->bv_len = len;
bv->bv_val = ch_malloc(len);
ptr = (unsigned char *)bv->bv_val;
@@ -521,11 +613,23 @@ int entry_encode(Entry *e, struct berval *bv)
entry_putlen(&ptr, i);
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,
+ AC_MEMCPY(ptr, a->a_vals[i].bv_val,
a->a_vals[i].bv_len);
ptr += a->a_vals[i].bv_len;
*ptr++ = '\0';
}
+ if (a->a_nvals != a->a_vals) {
+ entry_putlen(&ptr, i);
+ for (i=0; a->a_nvals[i].bv_val; i++) {
+ entry_putlen(&ptr, a->a_nvals[i].bv_len);
+ AC_MEMCPY(ptr, a->a_nvals[i].bv_val,
+ a->a_nvals[i].bv_len);
+ ptr += a->a_nvals[i].bv_len;
+ *ptr++ = '\0';
+ }
+ } else {
+ entry_putlen(&ptr, 0);
+ }
}
}
*ptr = '\0';
@@ -534,7 +638,7 @@ int entry_encode(Entry *e, struct berval *bv)
/* Retrieve an Entry that was stored using entry_encode above.
* We malloc a single block with the size stored above for the Entry
- * and all if its Attributes. We also must lookup the stored
+ * and all of its Attributes. We also must lookup the stored
* attribute names to get AttributeDescriptions. To detect if the
* attributes of an Entry are later modified, we note that e->e_attr
* is always a constant offset from (e).
@@ -545,7 +649,7 @@ int entry_encode(Entry *e, struct berval *bv)
*/
int entry_decode(struct berval *bv, Entry **e)
{
- int i, j;
+ int i, j, count;
int rc;
Attribute *a;
Entry *x;
@@ -555,13 +659,23 @@ int entry_decode(struct berval *bv, Entry **e)
BerVarray bptr;
i = entry_getlen(&ptr);
+ if (!i) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, INFO,
+ "entry_decode: entry length was zero\n", 0, 0, 0);
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "entry_decode: entry length was zero\n", 0, 0, 0);
+#endif
+ return LDAP_OTHER;
+ }
x = ch_calloc(1, i);
i = entry_getlen(&ptr);
- x->e_name.bv_val = ptr;
+ x->e_name.bv_val = (char *) ptr;
x->e_name.bv_len = i;
ptr += i+1;
i = entry_getlen(&ptr);
- x->e_nname.bv_val = ptr;
+ x->e_nname.bv_val = (char *) ptr;
x->e_nname.bv_len = i;
ptr += i+1;
#ifdef NEW_LOGGING
@@ -583,7 +697,7 @@ int entry_decode(struct berval *bv, Entry **e)
while ((i = entry_getlen(&ptr))) {
struct berval bv;
bv.bv_len = i;
- bv.bv_val = ptr;
+ bv.bv_val = (char *) ptr;
if (a) {
a->a_next = (Attribute *)bptr;
}
@@ -618,7 +732,7 @@ int entry_decode(struct berval *bv, Entry **e)
bptr = (BerVarray)(a+1);
a->a_vals = bptr;
a->a_flags = 0;
- j = entry_getlen(&ptr);
+ count = j = entry_getlen(&ptr);
while (j) {
i = entry_getlen(&ptr);
@@ -631,9 +745,27 @@ int entry_decode(struct berval *bv, Entry **e)
bptr->bv_val = NULL;
bptr->bv_len = 0;
bptr++;
+
+ j = entry_getlen(&ptr);
+ if (j) {
+ a->a_nvals = bptr;
+ while (j) {
+ i = entry_getlen(&ptr);
+ bptr->bv_len = i;
+ bptr->bv_val = (char *)ptr;
+ ptr += i+1;
+ bptr++;
+ j--;
+ }
+ bptr->bv_val = NULL;
+ bptr->bv_len = 0;
+ bptr++;
+ } else {
+ a->a_nvals = a->a_vals;
+ }
}
- if (a)
- a->a_next = NULL;
+
+ if (a) a->a_next = NULL;
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, DETAIL1, "entry_decode: %s\n", x->e_dn, 0, 0 );
#else
@@ -643,4 +775,22 @@ int entry_decode(struct berval *bv, Entry **e)
*e = x;
return 0;
}
-#endif
+
+Entry *entry_dup( Entry *e )
+{
+ Entry *ret;
+
+ ret = (Entry *)ch_calloc( 1, sizeof(*ret) );
+
+ ret->e_id = e->e_id;
+ ber_dupbv( &ret->e_name, &e->e_name );
+ ber_dupbv( &ret->e_nname, &e->e_nname );
+ ret->e_attrs = attrs_dup( e->e_attrs );
+ ret->e_ocflags = e->e_ocflags;
+ ret->e_bv.bv_val = NULL;
+ ret->e_bv.bv_len = 0;
+ ret->e_private = NULL;
+
+ return ret;
+}
+