X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foperational.c;h=fd12d0aff6e38f89c691edfe763b8b015e05aedb;hb=da6d9eb0463255782f3fa70c61fd958d94c048cf;hp=b9396b2473fd194affd1174765a1349981bedb1e;hpb=07ebdca237e239aeca47ff53b8f68d5f24ae4a7a;p=openldap
diff --git a/servers/slapd/operational.c b/servers/slapd/operational.c
index b9396b2473..fd12d0aff6 100644
--- a/servers/slapd/operational.c
+++ b/servers/slapd/operational.c
@@ -1,7 +1,16 @@
/* operational.c - routines to deal with on-the-fly operational attrs */
-/*
- * Copyright 2001-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2001-2007 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
+ * .
*/
#include "portable.h"
@@ -12,46 +21,66 @@
* helpers for on-the-fly operational attribute generation
*/
-#ifdef SLAPD_SCHEMA_DN
Attribute *
slap_operational_subschemaSubentry( Backend *be )
{
Attribute *a;
/* The backend wants to take care of it */
- if ( be && be->be_schemadn.bv_val )
- return NULL;
+ if ( be && !SLAP_FRONTEND(be) && be->be_schemadn.bv_val ) return NULL;
- a = ch_malloc( sizeof( Attribute ) );
- a->a_desc = slap_schema.si_ad_subschemaSubentry;
+ a = attr_alloc( slap_schema.si_ad_subschemaSubentry );
a->a_vals = ch_malloc( 2 * sizeof( struct berval ) );
- ber_dupbv( a->a_vals, &global_schemadn );
+ ber_dupbv( a->a_vals, &frontendDB->be_schemadn );
+ a->a_vals[1].bv_len = 0;
a->a_vals[1].bv_val = NULL;
- a->a_next = NULL;
- a->a_flags = 0;
+ a->a_nvals = ch_malloc( 2 * sizeof( struct berval ) );
+ ber_dupbv( a->a_nvals, &frontendDB->be_schemandn );
+ a->a_nvals[1].bv_len = 0;
+ a->a_nvals[1].bv_val = NULL;
+
+ return a;
+}
+
+Attribute *
+slap_operational_entryDN( Entry *e )
+{
+ Attribute *a;
+
+ assert( e != NULL );
+ assert( !BER_BVISNULL( &e->e_name ) );
+ assert( !BER_BVISNULL( &e->e_nname ) );
+
+ a = attr_alloc( slap_schema.si_ad_entryDN );
+
+ a->a_vals = ch_malloc( 2 * sizeof( struct berval ) );
+ ber_dupbv( &a->a_vals[ 0 ], &e->e_name );
+ BER_BVZERO( &a->a_vals[ 1 ] );
+
+ a->a_nvals = ch_malloc( 2 * sizeof( struct berval ) );
+ ber_dupbv( &a->a_nvals[ 0 ], &e->e_nname );
+ BER_BVZERO( &a->a_nvals[ 1 ] );
return a;
}
-#endif /* SLAPD_SCHEMA_DN */
Attribute *
slap_operational_hasSubordinate( int hs )
{
Attribute *a;
-
- a = ch_malloc( sizeof( Attribute ) );
- a->a_desc = slap_schema.si_ad_hasSubordinates;
+ struct berval val;
+
+ val = hs ? slap_true_bv : slap_false_bv;
+ a = attr_alloc( slap_schema.si_ad_hasSubordinates );
a->a_vals = ch_malloc( 2 * sizeof( struct berval ) );
- ber_str2bv( hs ? "TRUE" : "FALSE",
- hs ? sizeof("TRUE")-1 : sizeof("FALSE")-1,
- 1, a->a_vals );
+
+ ber_dupbv( &a->a_vals[0], &val );
a->a_vals[1].bv_val = NULL;
- a->a_next = NULL;
- a->a_flags = 0;
+ a->a_nvals = a->a_vals;
return a;
}