/* 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"
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 id = 0;
+ 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:
*
- * <id>\n
* dn: <dn>\n
* [<attr>:[:] <value>\n]
* [<tab><continuedvalue>\n]*
Debug( LDAP_DEBUG_TRACE, "=> str2entry\n",
s ? s : "NULL", 0, 0 );
- /* check to see if there's an id included */
- next = s;
- 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 );
- return( NULL );
- }
- }
-
/* initialize reader/writer lock */
- e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+ e = (Entry *) ch_malloc( sizeof(Entry) );
if( e == NULL ) {
Debug( LDAP_DEBUG_TRACE,
return( NULL );
}
- e->e_id = id;
+ /* initialize entry */
+ e->e_id = NOID;
+ e->e_dn = NULL;
+ e->e_ndn = NULL;
+ e->e_attrs = NULL;
e->e_private = NULL;
/* dn + attributes */
- e->e_attrs = NULL;
- vals[0] = &bval;
+ vals[0] = &value;
vals[1] = NULL;
+#ifndef SLAPD_SCHEMA_NOT_COMPAT
ptype[0] = '\0';
+#endif
+
+ next = s;
while ( (s = ldif_getline( &next )) != NULL ) {
if ( *s == '\n' || *s == '\0' ) {
break;
}
- if ( ldif_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;
a = NULL;
}
+#endif
if ( strcasecmp( type, "dn" ) == 0 ) {
+ free( type );
+
if ( e->e_dn != NULL ) {
Debug( LDAP_DEBUG_ANY,
"str2entry: entry %ld has multiple dns \"%s\" and \"%s\" (second ignored)\n",
- e->e_id, e->e_dn, value );
+ 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 = 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 = dn_normalize_case( ch_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 */
return( NULL );
}
- 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 );
- }
+ /* 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;
/*
* In string format, an entry looks like this:
- * <id>\n
* dn: <dn>\n
* [<attr>: <value>\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: <dn>" */
tmplen = strlen( e->e_dn );
MAKE_SPACE( LDIF_SIZE_NEEDED( 2, tmplen ));
- ldif_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 */
/* put "<type>:[:] <value>" 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 ));
- ldif_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 );
}
}
void
entry_free( Entry *e )
{
- int i;
Attribute *a, *next;
if ( e->e_dn != NULL ) {
projects / openldap / blobdiff