X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fentry.c;h=37c72c3cb2c9d05f162135228e9097ca6eec1109;hb=9c5fe98a79afc5303a1e82a93fd759532f289d27;hp=745e96a2e90da4c15fdc297d4d439985f6725db6;hpb=5ad51b6150311e38fb8fe872880e1b20dd0425a1;p=openldap
diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 745e96a2e9..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-2003 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"
@@ -45,9 +64,7 @@ str2entry( char *s )
Entry *e;
char *type;
struct berval vals[2];
-#ifdef SLAP_NVALUES
struct berval nvals[2], *nvalsp;
-#endif
AttributeDescription *ad;
const char *text;
char *next;
@@ -68,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
@@ -129,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,
@@ -193,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 ) {
/*
@@ -220,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 );
@@ -239,7 +257,6 @@ str2entry( char *s )
}
}
-#ifdef SLAP_NVALUES
nvalsp = NULL;
nvals[0].bv_val = NULL;
@@ -250,7 +267,7 @@ str2entry( char *s )
SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
ad->ad_type->sat_syntax,
ad->ad_type->sat_equality,
- &vals[0], &nvals[0] );
+ &vals[0], &nvals[0], NULL );
if( rc ) {
#ifdef NEW_LOGGING
@@ -272,13 +289,8 @@ str2entry( char *s )
nvalsp = &nvals[0];
}
-#endif
-#ifdef SLAP_NVALUES
rc = attr_merge( e, ad, vals, nvalsp );
-#else
- rc = attr_merge( e, ad, vals );
-#endif
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, DETAIL1,
@@ -295,9 +307,7 @@ str2entry( char *s )
free( type );
free( vals[0].bv_val );
-#ifdef SLAP_NVALUES
free( nvals[0].bv_val );
-#endif
}
/* check to make sure there was a dn: line */
@@ -432,7 +442,7 @@ 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
@@ -440,9 +450,8 @@ entry_dn_cmp( const void *v_e1, const void *v_e2 )
{
/* compare their normalized UPPERCASED dn's */
const Entry *e1 = v_e1, *e2 = v_e2;
- int rc = e1->e_nname.bv_len - e2->e_nname.bv_len;
- if (rc) return rc;
- return( strcmp( e1->e_ndn, e2->e_ndn ) );
+
+ return ber_bvcmp( &e1->e_nname, &e2->e_nname );
}
int
@@ -452,8 +461,9 @@ entry_id_cmp( const void *v_e1, const void *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)
@@ -468,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)
@@ -505,33 +516,22 @@ entry_getlen(unsigned char **buf)
return 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
- * terminated. The entire buffer size is precomputed so that a single
- * malloc can be performed. The entry size is also recorded,
- * to aid in entry_decode.
- */
-int entry_encode(Entry *e, struct berval *bv)
+/* 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;
- unsigned char *ptr;
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, DETAIL1, "entry_encode: id: 0x%08lx \"%s\"\n",
- (long) e->e_id, e->e_dn, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE, "=> entry_encode(0x%08lx): %s\n",
- (long) e->e_id, e->e_dn, 0 );
-#endif
dnlen = e->e_name.bv_len;
- ndnlen = e->e_nname.bv_len;
- len = dnlen + ndnlen + 2; /* two trailing NUL bytes */
+ len = dnlen + 1; /* trailing NUL byte */
len += entry_lenlen(dnlen);
- len += entry_lenlen(ndnlen);
+ 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);
@@ -544,8 +544,7 @@ int entry_encode(Entry *e, struct berval *bv)
}
len += entry_lenlen(i);
siz += sizeof(struct berval); /* empty berval at end */
-#ifdef SLAP_NVALUES_ON_DISK
- if (a->a_nvals != a->a_vals) {
+ 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;
@@ -556,10 +555,40 @@ int entry_encode(Entry *e, struct berval *bv)
} else {
len += entry_lenlen(0); /* 0 nvals */
}
-#endif
}
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
+ * terminated. The entire buffer size is precomputed so that a single
+ * malloc can be performed. The entry size is also recorded,
+ * to aid in entry_decode.
+ */
+int entry_encode(Entry *e, struct berval *bv)
+{
+ ber_len_t siz = sizeof(Entry);
+ ber_len_t len, dnlen, ndnlen;
+ int i;
+ Attribute *a;
+ unsigned char *ptr;
+
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, DETAIL1, "entry_encode: id: 0x%08lx \"%s\"\n",
+ (long) e->e_id, e->e_dn, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "=> entry_encode(0x%08lx): %s\n",
+ (long) e->e_id, e->e_dn, 0 );
+#endif
+ dnlen = e->e_name.bv_len;
+ ndnlen = e->e_nname.bv_len;
+
+ entry_flatsize( e, &siz, &len, 1 );
+
bv->bv_len = len;
bv->bv_val = ch_malloc(len);
ptr = (unsigned char *)bv->bv_val;
@@ -589,7 +618,6 @@ int entry_encode(Entry *e, struct berval *bv)
ptr += a->a_vals[i].bv_len;
*ptr++ = '\0';
}
-#ifdef SLAP_NVALUES_ON_DISK
if (a->a_nvals != a->a_vals) {
entry_putlen(&ptr, i);
for (i=0; a->a_nvals[i].bv_val; i++) {
@@ -602,7 +630,6 @@ int entry_encode(Entry *e, struct berval *bv)
} else {
entry_putlen(&ptr, 0);
}
-#endif
}
}
*ptr = '\0';
@@ -632,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
@@ -660,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;
}
@@ -709,7 +746,6 @@ int entry_decode(struct berval *bv, Entry **e)
bptr->bv_len = 0;
bptr++;
-#ifdef SLAP_NVALUES_ON_DISK
j = entry_getlen(&ptr);
if (j) {
a->a_nvals = bptr;
@@ -727,40 +763,6 @@ int entry_decode(struct berval *bv, Entry **e)
} else {
a->a_nvals = a->a_vals;
}
-#elif defined(SLAP_NVALUES)
- if( count && ad->ad_type->sat_equality &&
- ad->ad_type->sat_equality->smr_normalize )
- {
- a->a_nvals = ch_malloc((count+1)*sizeof(struct berval));
-
- for(j=0; jad_type->sat_equality->smr_normalize(
- SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
- ad->ad_type->sat_syntax,
- ad->ad_type->sat_equality,
- &a->a_vals[j], &a->a_nvals[j] );
-
- if( rc ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, DETAIL1,
- "entry_decode: NULL (smr_normalize %d)\n",
- rc, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "<= entry_decode NULL (smr_normalize %d)\n",
- rc, 0, 0 );
-#endif
-
- return rc;
- }
- }
- a->a_nvals[j].bv_val = NULL;
- a->a_nvals[j].bv_len = 0;
- } else {
- a->a_nvals = a->a_vals;
- }
-#endif
-
}
if (a) a->a_next = NULL;
@@ -773,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;
+}
+