]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/add.c
projects / openldap / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
+ Fixed slapd connectionless LDAP support
[openldap] / servers / slapd / add.c
diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 7df87348aa1c7b1b5b8740e63044c4b5e5b24230..acf2e2f85ecb4b4cb56ce7521eaed42d00bfa39c 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * 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 <ac/time.h>
 #include <ac/socket.h>
 
+#include "lutil.h"
 #include "slap.h"
 
 int
@@ -46,6 +47,7 @@ do_add( Operation *op, SlapReply *rs )
        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 ) {
@@ -214,7 +217,7 @@ fe_op_add( Operation *op, SlapReply *rs )
        Modifications   *modlist = op->ora_modlist;
        Modifications   **modtail = &modlist;
        int             rc = 0;
-       BackendDB *op_be;
+       BackendDB *op_be, *bd = op->o_bd;
        char            textbuf[ SLAP_TEXT_BUFLEN ];
        size_t          textlen = sizeof( textbuf );
 
@@ -227,14 +230,13 @@ fe_op_add( Operation *op, SlapReply *rs )
         */
        op->o_bd = select_backend( &op->ora_e->e_nname, manageDSAit, 1 );
        if ( op->o_bd == NULL ) {
+               op->o_bd = bd;
                rs->sr_ref = referral_rewrite( default_referral,
                        NULL, &op->ora_e->e_name, LDAP_SCOPE_DEFAULT );
                if ( !rs->sr_ref ) rs->sr_ref = default_referral;
                if ( rs->sr_ref ) {
                        rs->sr_err = LDAP_REFERRAL;
-                       op->o_bd = frontendDB;
                        send_ldap_result( op, rs );
-                       op->o_bd = NULL;
 
                        if ( rs->sr_ref != default_referral ) {
                                ber_bvarray_free( rs->sr_ref );
@@ -312,14 +314,6 @@ 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 );
@@ -384,6 +378,7 @@ fe_op_add( Operation *op, SlapReply *rs )
        }
 
 done:;
+       op->o_bd = bd;
        return rc;
 }
 
@@ -475,6 +470,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 +501,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 +623,127 @@ 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;
+               int gotcsn = 0;
+               timestamp.bv_val = timebuf;
+
+               a = attr_find( op->ora_e->e_attrs, slap_schema.si_ad_entryCSN );
+               if ( a ) {
+                       gotcsn = 1;
+                       csn = a->a_vals[0];
+               }
+               if ( BER_BVISEMPTY( &op->o_csn )) {
+                       if ( !gotcsn ) {
+                               csn.bv_val = csnbuf;
+                               csn.bv_len = sizeof(csnbuf);
+                               slap_get_csn( op, &csn, manage_ctxcsn );
+                       } else {
+                               if ( manage_ctxcsn )
+                                       slap_queue_csn( op, &csn );
+                       }
+               } 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;
+                       strncpy( 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, &timestamp );
+               }
+
+               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, &timestamp, NULL );
+               }
+
+               if ( !gotcsn ) {
+                       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, &timestamp, NULL );
+               }
+
+       }
+       return LDAP_SUCCESS;
+}
Cloned from git://git.openldap.org/openldap.git