X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fadd.c;h=e45ded2ae6a9dd06483bc095b39a54bf3c952399;hb=517fa54bb0f764968ca56e7931a09adac4f33af6;hp=8593bf1e290a02cc3bebc9519e16733ddd2ff43b;hpb=62eea3b4529be3c1a5ed9475dbd7e4ca3b69fe32;p=openldap diff --git a/servers/slapd/add.c b/servers/slapd/add.c index 8593bf1e29..e45ded2ae6 100644 --- a/servers/slapd/add.c +++ b/servers/slapd/add.c @@ -18,7 +18,6 @@ #include "portable.h" #include - #include #include #include @@ -26,14 +25,10 @@ #include "ldap_pvt.h" #include "slap.h" -#ifdef SLAPD_SCHEMA_NOT_COMPAT static int slap_mods2entry( Modifications *mods, Entry **e, const char **text ); -#else -static int add_created_attrs(Operation *op, Entry *e); -#endif int do_add( Connection *conn, Operation *op ) @@ -44,11 +39,9 @@ do_add( Connection *conn, Operation *op ) ber_tag_t tag; Entry *e; Backend *be; -#ifdef SLAPD_SCHEMA_NOT_COMPAT LDAPModList *modlist = NULL; LDAPModList **modtail = &modlist; Modifications *mods = NULL; -#endif const char *text; int rc = LDAP_SUCCESS; @@ -92,18 +85,13 @@ do_add( Connection *conn, Operation *op ) e->e_attrs = NULL; e->e_private = NULL; - Debug( LDAP_DEBUG_ARGS, " do_add: ndn (%s)\n", e->e_ndn, 0, 0 ); + Debug( LDAP_DEBUG_ARGS, "do_add: ndn (%s)\n", e->e_ndn, 0, 0 ); /* get the attrs */ for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT; tag = ber_next_element( ber, &len, last ) ) { -#ifdef SLAPD_SCHEMA_NOT_COMPAT LDAPModList *mod = (LDAPModList *) ch_malloc( sizeof(LDAPModList) ); -#else - LDAPModList tmpmod; - LDAPModList *mod = &tmpmod; -#endif mod->ml_op = LDAP_MOD_ADD; mod->ml_next = NULL; @@ -114,9 +102,7 @@ do_add( Connection *conn, Operation *op ) send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, "decoding error" ); rc = -1; -#ifdef SLAPD_SCHEMA_NOT_COMPAT free( mod ); -#endif goto done; } @@ -126,21 +112,12 @@ do_add( Connection *conn, Operation *op ) send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL, "no values for attribute type", NULL, NULL ); free( mod->ml_type ); -#ifdef SLAPD_SCHEMA_NOT_COMPAT free( mod ); -#endif goto done; } -#ifdef SLAPD_SCHEMA_NOT_COMPAT *modtail = mod; modtail = &mod->ml_next; -#else - attr_merge( e, mod->ml_type, mod->ml_bvalues ); - - free( mod->ml_type ); - ber_bvecfree( mod->ml_bvalues ); -#endif } if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) { @@ -156,12 +133,7 @@ do_add( Connection *conn, Operation *op ) goto done; } -#ifdef SLAPD_SCHEMA_NOT_COMPAT - if ( modlist == NULL ) -#else - if ( e->e_attrs == NULL ) -#endif - { + if ( modlist == NULL ) { send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL, "no attributes provided", NULL, NULL ); goto done; @@ -184,13 +156,18 @@ do_add( Connection *conn, Operation *op ) /* make sure this backend recongizes critical controls */ rc = backend_check_controls( be, conn, op, &text ) ; - if( rc != LDAP_SUCCESS ) { send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); goto done; } + /* check for referrals */ + rc = backend_check_referrals( be, conn, op, e->e_dn, e->e_ndn ); + if ( rc != LDAP_SUCCESS ) { + goto done; + } + if ( global_readonly || be->be_readonly ) { Debug( LDAP_DEBUG_ANY, "do_add: database is read-only\n", 0, 0, 0 ); @@ -218,7 +195,6 @@ do_add( Connection *conn, Operation *op ) { int update = be->be_update_ndn != NULL; -#ifdef SLAPD_SCHEMA_NOT_COMPAT rc = slap_modlist2mods( modlist, update, &mods, &text ); if( rc != LDAP_SUCCESS ) { send_ldap_result( conn, op, rc, @@ -226,13 +202,11 @@ do_add( Connection *conn, Operation *op ) goto done; } -#endif #ifndef SLAPD_MULTIMASTER if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED && global_lastmod == ON)) && !update ) #endif { -#ifdef SLAPD_SCHEMA_NOT_COMPAT Modifications **modstail; for( modstail = &mods; *modstail != NULL; @@ -242,10 +216,6 @@ do_add( Connection *conn, Operation *op ) assert( (*modstail)->sml_desc != NULL ); } rc = slap_mods_opattrs( op, modstail, &text ); -#else - char *text = "no-user-modification attribute type"; - rc = add_created_attrs( op, e ); -#endif if( rc != LDAP_SUCCESS ) { send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); @@ -253,14 +223,12 @@ do_add( Connection *conn, Operation *op ) } } -#ifdef SLAPD_SCHEMA_NOT_COMPAT rc = slap_mods2entry( mods, &e, &text ); if( rc != LDAP_SUCCESS ) { send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); goto done; } -#endif if ( (*be->be_add)( be, conn, op, e ) == 0 ) { #ifdef SLAPD_MULTIMASTER @@ -287,14 +255,12 @@ do_add( Connection *conn, Operation *op ) } done: -#ifdef SLAPD_SCHEMA_NOT_COMPAT if( modlist != NULL ) { slap_modlist_free( modlist ); } if( mods != NULL ) { slap_mods_free( mods ); } -#endif if( e != NULL ) { entry_free( e ); } @@ -302,7 +268,6 @@ done: return rc; } -#ifdef SLAPD_SCHEMA_NOT_COMPAT static int slap_mods2entry( Modifications *mods, Entry **e, @@ -320,8 +285,34 @@ static int slap_mods2entry( attr = attr_find( (*e)->e_attrs, mods->sml_desc ); if( attr != NULL ) { +#define SLURPD_FRIENDLY +#ifdef SLURPD_FRIENDLY + ber_len_t i,j; + + for( i=0; attr->a_vals[i]; i++ ) { + /* count them */ + } + for( j=0; mods->sml_bvalues[j]; j++ ) { + /* count them */ + } + j++; /* NULL */ + + attr->a_vals = ch_realloc( attr->a_vals, + sizeof( struct berval * ) * (i+j) ); + + /* should check for duplicates */ + memcpy( &attr->a_vals[i], mods->sml_bvalues, + sizeof( struct berval * ) * j ); + + /* trim the mods array */ + ch_free( mods->sml_bvalues ); + mods->sml_bvalues = NULL; + + continue; +#else *text = "attribute provided more than once"; - return LDAP_OPERATIONS_ERROR; + return LDAP_TYPE_OR_VALUE_EXISTS; +#endif } attr = ch_calloc( 1, sizeof(Attribute) ); @@ -342,51 +333,3 @@ static int slap_mods2entry( return LDAP_SUCCESS; } -#else -static int -add_created_attrs( Operation *op, Entry *e ) -{ - char buf[22]; - struct berval bv; - struct berval *bvals[2]; - Attribute *a; - struct tm *ltm; - time_t currenttime; - - Debug( LDAP_DEBUG_TRACE, "add_created_attrs\n", 0, 0, 0 ); - - bvals[0] = &bv; - bvals[1] = NULL; - - /* return error on any attempts by the user to add these attrs */ - for ( a = e->e_attrs; a != NULL; a = a->a_next ) { - if ( oc_check_op_no_usermod_attr( a->a_type ) ) { - return LDAP_CONSTRAINT_VIOLATION; - } - } - - if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) { - bv.bv_val = SLAPD_ANONYMOUS; - bv.bv_len = sizeof(SLAPD_ANONYMOUS)-1; -; - } else { - bv.bv_val = op->o_dn; - bv.bv_len = strlen( bv.bv_val ); - } - attr_merge( e, "creatorsname", bvals ); - attr_merge( e, "modifiersname", bvals ); - - currenttime = slap_get_time(); - ldap_pvt_thread_mutex_lock( &gmtime_mutex ); - ltm = gmtime( ¤ttime ); - strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm ); - ldap_pvt_thread_mutex_unlock( &gmtime_mutex ); - - bv.bv_val = buf; - bv.bv_len = strlen( bv.bv_val ); - attr_merge( e, "createtimestamp", bvals ); - attr_merge( e, "modifytimestamp", bvals ); - - return LDAP_SUCCESS; -} -#endif