X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fadd.c;h=9056e412ae07eda7200489ff8a0ff7b6f64df903;hb=a17df0e810578d593808c6afeb0cdea55a65633c;hp=a2f4e242ac9392735edf7781723e719cefdc8c3e;hpb=486bfe7e1722ee499c22628880c7662a8d9d0d75;p=openldap
diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index a2f4e242ac..9056e412ae 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,7 @@
#include
#include
+#include "lutil.h"
#include "slap.h"
int
@@ -40,12 +41,13 @@ do_add( Operation *op, SlapReply *rs )
struct berval dn = BER_BVNULL;
ber_len_t len;
ber_tag_t tag;
- Modifications *modlist = NULL, *next;
+ Modifications *modlist = NULL;
Modifications **modtail = &modlist;
Modifications tmp;
char textbuf[ SLAP_TEXT_BUFLEN ];
size_t textlen = sizeof( textbuf );
int rc = 0;
+ int freevals = 1;
Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
/*
@@ -174,6 +176,8 @@ do_add( Operation *op, SlapReply *rs )
goto done;
}
+ freevals = 0;
+
op->o_bd = frontendDB;
rc = frontendDB->be_add( op, rs );
if ( rc == 0 ) {
@@ -192,10 +196,9 @@ do_add( Operation *op, SlapReply *rs )
}
done:;
- slap_graduate_commit_csn( op );
-
if ( modlist != NULL ) {
- slap_mods_free( modlist, 0 );
+ /* in case of error, free the values as well */
+ slap_mods_free( modlist, freevals );
}
if ( op->ora_e != NULL ) {
@@ -211,10 +214,9 @@ int
fe_op_add( Operation *op, SlapReply *rs )
{
int manageDSAit;
- Modifications *modlist = op->ora_modlist;
- Modifications **modtail = &modlist;
+ Modifications **modtail = &op->ora_modlist;
int rc = 0;
- BackendDB *op_be;
+ BackendDB *op_be;
char textbuf[ SLAP_TEXT_BUFLEN ];
size_t textlen = sizeof( textbuf );
@@ -265,7 +267,7 @@ fe_op_add( Operation *op, SlapReply *rs )
goto done;
}
- rs->sr_err = slap_mods_obsolete_check( op, modlist,
+ rs->sr_err = slap_mods_obsolete_check( op, op->ora_modlist,
&rs->sr_text, textbuf, textlen );
if ( rs->sr_err != LDAP_SUCCESS ) {
@@ -284,7 +286,7 @@ fe_op_add( Operation *op, SlapReply *rs )
int repl_user = be_isupdate( op );
#ifndef SLAPD_MULTIMASTER
if ( !SLAP_SHADOW(op->o_bd) || repl_user )
-#endif
+#endif /* ! SLAPD_MULTIMASTER */
{
int update = !BER_BVISEMPTY( &op->o_bd->be_update_ndn );
slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
@@ -292,7 +294,7 @@ fe_op_add( Operation *op, SlapReply *rs )
op->o_bd = op_be;
if ( !update ) {
- rs->sr_err = slap_mods_no_user_mod_check( op, modlist,
+ rs->sr_err = slap_mods_no_user_mod_check( op, op->ora_modlist,
&rs->sr_text, textbuf, textlen );
if ( rs->sr_err != LDAP_SUCCESS ) {
@@ -303,7 +305,7 @@ fe_op_add( Operation *op, SlapReply *rs )
if ( !repl_user ) {
/* go to the last mod */
- for ( modtail = &modlist;
+ for ( modtail = &op->ora_modlist;
*modtail != NULL;
modtail = &(*modtail)->sml_next )
{
@@ -312,17 +314,9 @@ fe_op_add( Operation *op, SlapReply *rs )
}
- rs->sr_err = slap_mods_opattrs( op, modlist,
- modtail, &rs->sr_text,
- textbuf, textlen, 1 );
- if ( rs->sr_err != LDAP_SUCCESS ) {
- send_ldap_result( op, rs );
- goto done;
- }
-
/* check for duplicate values */
rs->sr_err = slap_mods_no_repl_user_mod_check( op,
- modlist, &rs->sr_text, textbuf, textlen );
+ op->ora_modlist, &rs->sr_text, textbuf, textlen );
if ( rs->sr_err != LDAP_SUCCESS ) {
send_ldap_result( op, rs );
goto done;
@@ -338,7 +332,7 @@ fe_op_add( Operation *op, SlapReply *rs )
#ifdef SLAPD_MULTIMASTER
if ( !repl_user )
-#endif
+#endif /* SLAPD_MULTIMASTER */
{
cb.sc_next = op->o_callback;
op->o_callback = &cb;
@@ -475,6 +469,7 @@ slap_mods2entry(
snprintf( textbuf, textlen,
"attribute '%s' provided more than once",
mods->sml_desc->ad_cname.bv_val );
+ *text = textbuf;
return LDAP_TYPE_OR_VALUE_EXISTS;
#endif
}
@@ -505,6 +500,7 @@ slap_mods2entry(
snprintf( textbuf, textlen,
"%s: value #%d provided more than once",
mods->sml_desc->ad_cname.bv_val, j );
+ *text = textbuf;
return LDAP_TYPE_OR_VALUE_EXISTS;
} else if ( rc != LDAP_SUCCESS ) {
@@ -626,3 +622,118 @@ slap_entry2mods(
return LDAP_SUCCESS;
}
+int slap_add_opattrs(
+ Operation *op,
+ const char **text,
+ char *textbuf,
+ size_t textlen,
+ int manage_ctxcsn )
+{
+ struct berval name, timestamp, csn = BER_BVNULL;
+ struct berval nname, tmp;
+ char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+ char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
+ Attribute *a;
+
+ a = attr_find( op->ora_e->e_attrs,
+ slap_schema.si_ad_structuralObjectClass );
+
+ if ( !a ) {
+ Attribute *oc;
+ int rc;
+
+ oc = attr_find( op->ora_e->e_attrs, slap_schema.si_ad_objectClass );
+ if ( oc ) {
+ rc = structural_class( oc->a_vals, &tmp, NULL, text,
+ textbuf, textlen );
+ if( rc != LDAP_SUCCESS ) return rc;
+
+ attr_merge_one( op->ora_e, slap_schema.si_ad_structuralObjectClass,
+ &tmp, NULL );
+ }
+ }
+
+ if ( SLAP_LASTMOD( op->o_bd ) ) {
+ char *ptr;
+ timestamp.bv_val = timebuf;
+ if ( BER_BVISEMPTY( &op->o_csn )) {
+ if ( SLAP_SHADOW( op->o_bd ))
+ manage_ctxcsn = 0;
+ csn.bv_val = csnbuf;
+ csn.bv_len = sizeof(csnbuf);
+ slap_get_csn( op, &csn, manage_ctxcsn );
+ } else {
+ csn = op->o_csn;
+ }
+ ptr = ber_bvchr( &csn, '#' );
+ if ( ptr ) {
+ timestamp.bv_len = ptr - csn.bv_val;
+ if ( timestamp.bv_len >= sizeof(timebuf) ) /* ?!? */
+ timestamp.bv_len = sizeof(timebuf) - 1;
+ AC_MEMCPY( timebuf, csn.bv_val, timestamp.bv_len );
+ timebuf[timestamp.bv_len] = '\0';
+ } else {
+ time_t now = slap_get_time();
+
+ timestamp.bv_len = sizeof(timebuf);
+
+ slap_timestamp( &now, ×tamp );
+ }
+
+ if ( BER_BVISEMPTY( &op->o_dn ) ) {
+ BER_BVSTR( &name, SLAPD_ANONYMOUS );
+ nname = name;
+ } else {
+ name = op->o_dn;
+ nname = op->o_ndn;
+ }
+
+ a = attr_find( op->ora_e->e_attrs,
+ slap_schema.si_ad_entryUUID );
+ if ( !a ) {
+ char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
+
+ tmp.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
+ tmp.bv_val = uuidbuf;
+
+ attr_merge_normalize_one( op->ora_e,
+ slap_schema.si_ad_entryUUID, &tmp, op->o_tmpmemctx );
+ }
+
+ a = attr_find( op->ora_e->e_attrs,
+ slap_schema.si_ad_creatorsName );
+ if ( !a ) {
+ attr_merge_one( op->ora_e,
+ slap_schema.si_ad_creatorsName, &name, &nname );
+ }
+
+ a = attr_find( op->ora_e->e_attrs,
+ slap_schema.si_ad_createTimestamp );
+ if ( !a ) {
+ attr_merge_one( op->ora_e,
+ slap_schema.si_ad_createTimestamp, ×tamp, NULL );
+ }
+
+ a = attr_find( op->ora_e->e_attrs,
+ slap_schema.si_ad_entryCSN );
+ if ( !a ) {
+ attr_merge_one( op->ora_e,
+ slap_schema.si_ad_entryCSN, &csn, NULL );
+ }
+
+ a = attr_find( op->ora_e->e_attrs,
+ slap_schema.si_ad_modifiersName );
+ if ( !a ) {
+ attr_merge_one( op->ora_e,
+ slap_schema.si_ad_modifiersName, &name, &nname );
+ }
+
+ a = attr_find( op->ora_e->e_attrs,
+ slap_schema.si_ad_modifyTimestamp );
+ if ( !a ) {
+ attr_merge_one( op->ora_e,
+ slap_schema.si_ad_modifyTimestamp, ×tamp, NULL );
+ }
+ }
+ return LDAP_SUCCESS;
+}