X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fadd.c;h=196a3189d5fd7b90d85bb7d14f347d0605e45481;hb=8743c05359d008eab5d65d5aacf1836bd583dafb;hp=b05acd47fced9ccecb7e9156a910365299d66075;hpb=9f92954dff09295d6d6c32725ece13a96c5e38a9;p=openldap diff --git a/servers/slapd/add.c b/servers/slapd/add.c index b05acd47fc..196a3189d5 100644 --- a/servers/slapd/add.c +++ b/servers/slapd/add.c @@ -10,36 +10,38 @@ * is provided ``as is'' without express or implied warranty. */ +#include "portable.h" + #include -#include -#include -#include -#include -#include "slap.h" -extern Backend *select_backend(); -extern char *dn_normalize(); +#include +#include +#include -extern char *default_referral; -extern time_t currenttime; -extern pthread_mutex_t currenttime_mutex; -extern int global_lastmod; +#include "slap.h" -static void add_created_attrs(); +static int add_created_attrs(Operation *op, Entry *e); -void -do_add( conn, op ) - Connection *conn; - Operation *op; +int +do_add( Connection *conn, Operation *op ) { BerElement *ber = op->o_ber; - char *dn, *last; - unsigned long len, tag; + char *dn, *ndn, *last; + ber_len_t len; + ber_tag_t tag; Entry *e; Backend *be; + int rc = LDAP_SUCCESS; Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 ); + if( op->o_bind_in_progress ) { + Debug( LDAP_DEBUG_ANY, "do_add: SASL bind in progress.\n", 0, 0, 0 ); + send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, NULL, + "SASL bind in progress", NULL, NULL ); + return LDAP_SASL_BIND_IN_PROGRESS; + } + /* * Parse the add request. It looks like this: * @@ -52,20 +54,34 @@ do_add( conn, op ) * } */ - e = (Entry *) ch_calloc( 1, sizeof(Entry) ); - /* initialize reader/writer lock */ - entry_rdwr_init(e); - /* get the name */ - if ( ber_scanf( ber, "{a", &dn ) == LBER_ERROR ) { - Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 ); - send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, - "decoding error" ); - return; + if ( ber_scanf( ber, "{a", /*}*/ &dn ) == LBER_ERROR ) { + Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 ); + send_ldap_disconnect( conn, op, + LDAP_PROTOCOL_ERROR, "decoding error" ); + return -1; } + + ndn = ch_strdup( dn ); + + if ( dn_normalize_case( ndn ) == NULL ) { + Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn, 0, 0 ); + send_ldap_result( conn, op, LDAP_INVALID_DN_SYNTAX, NULL, + "invalid DN", NULL, NULL ); + free( dn ); + free( ndn ); + return LDAP_INVALID_DN_SYNTAX; + } + + e = (Entry *) ch_calloc( 1, sizeof(Entry) ); + e->e_dn = dn; - dn = dn_normalize( strdup( dn ) ); - Debug( LDAP_DEBUG_ARGS, " do_add: dn (%s)\n", dn, 0, 0 ); + e->e_ndn = ndn; + e->e_private = NULL; + + dn = NULL; + + Debug( LDAP_DEBUG_ARGS, " do_add: ndn (%s)\n", e->e_ndn, 0, 0 ); /* get the attrs */ e->e_attrs = NULL; @@ -75,19 +91,20 @@ do_add( conn, op ) struct berval **vals; if ( ber_scanf( ber, "{a{V}}", &type, &vals ) == LBER_ERROR ) { - send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, - NULL, "decoding error" ); + send_ldap_disconnect( conn, op, + LDAP_PROTOCOL_ERROR, "decoding error" ); entry_free( e ); - return; + return -1; } if ( vals == NULL ) { Debug( LDAP_DEBUG_ANY, "no values for type %s\n", type, 0, 0 ); - send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, - NULL ); + send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, + NULL, "no values for type", NULL, NULL ); + free( type ); entry_free( e ); - return; + return LDAP_PROTOCOL_ERROR; } attr_merge( e, type, vals ); @@ -96,19 +113,34 @@ do_add( conn, op ) ber_bvecfree( vals ); } + if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) { + entry_free( e ); + Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 ); + send_ldap_disconnect( conn, op, + LDAP_PROTOCOL_ERROR, "decoding error" ); + return -1; + } + + if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) { + entry_free( e ); + Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 ); + return rc; + } + Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d ADD dn=\"%s\"\n", - conn->c_connid, op->o_opid, dn, 0, 0 ); + op->o_connid, op->o_opid, e->e_ndn, 0, 0 ); /* * We could be serving multiple database backends. Select the * appropriate one, or send a referral to our "referral server" * if we don't hold it. */ - if ( (be = select_backend( dn )) == NULL ) { + be = select_backend( e->e_ndn ); + if ( be == NULL ) { entry_free( e ); - send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL, - default_referral ); - return; + send_ldap_result( conn, op, LDAP_REFERRAL, NULL, + NULL, default_referral, NULL ); + return rc; } /* @@ -117,65 +149,70 @@ do_add( conn, op ) * 2) this backend is master for what it holds; * 3) it's a replica and the dn supplied is the updatedn. */ - if ( be->be_add != NULL ) { + if ( be->be_add ) { /* do the update here */ - if ( be->be_updatedn == NULL || - strcasecmp( be->be_updatedn, op->o_dn ) == 0 ) { - + if ( be->be_update_ndn == NULL || + strcmp( be->be_update_ndn, op->o_ndn ) == 0 ) + { if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED && - global_lastmod == ON)) && be->be_updatedn == NULL ) { - - add_created_attrs( op, e ); + global_lastmod == ON)) && be->be_update_ndn == NULL ) + { + rc = add_created_attrs( op, e ); + + if( rc != LDAP_SUCCESS ) { + entry_free( e ); + send_ldap_result( conn, op, rc, + NULL, "no-user-modification attribute type", + NULL, NULL ); + return rc; + } } + if ( (*be->be_add)( be, conn, op, e ) == 0 ) { - replog( be, LDAP_REQ_ADD, e->e_dn, e, 0 ); + replog( be, op, e->e_dn, e ); + be_entry_release_w( be, e ); } } else { entry_free( e ); - send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL, - default_referral ); + send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL, + be->be_update_refs ? be->be_update_refs : default_referral, NULL ); } } else { Debug( LDAP_DEBUG_ARGS, " do_add: HHH\n", 0, 0, 0 ); entry_free( e ); - send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL, - "Function not implemented" ); + send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, + NULL, "Function not implemented", NULL, NULL ); } + + return rc; } -static void +static int add_created_attrs( Operation *op, Entry *e ) { char buf[22]; struct berval bv; struct berval *bvals[2]; - Attribute **a, **next; + Attribute *a; Attribute *tmp; struct tm *ltm; + time_t currenttime; Debug( LDAP_DEBUG_TRACE, "add_created_attrs\n", 0, 0, 0 ); bvals[0] = &bv; bvals[1] = NULL; - /* remove any attempts by the user to add these attrs */ - for ( a = &e->e_attrs; *a != NULL; a = next ) { - if ( strcasecmp( (*a)->a_type, "modifiersname" ) == 0 || - strcasecmp( (*a)->a_type, "modifytimestamp" ) == 0 || - strcasecmp( (*a)->a_type, "creatorsname" ) == 0 || - strcasecmp( (*a)->a_type, "createtimestamp" ) == 0 ) { - tmp = *a; - *a = (*a)->a_next; - attr_free( tmp ); - next = a; - } else { - next = &(*a)->a_next; + /* 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_no_usermod_attr( a->a_type ) ) { + return LDAP_CONSTRAINT_VIOLATION; } } if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) { - bv.bv_val = "NULLDN"; + bv.bv_val = ""; bv.bv_len = strlen( bv.bv_val ); } else { bv.bv_val = op->o_dn; @@ -183,7 +220,8 @@ add_created_attrs( Operation *op, Entry *e ) } attr_merge( e, "creatorsname", bvals ); - pthread_mutex_lock( ¤ttime_mutex ); + currenttime = slap_get_time(); + ldap_pvt_thread_mutex_lock( &gmtime_mutex ); #ifndef LDAP_LOCALTIME ltm = gmtime( ¤ttime ); strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm ); @@ -191,9 +229,11 @@ add_created_attrs( Operation *op, Entry *e ) ltm = localtime( ¤ttime ); strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm ); #endif - pthread_mutex_unlock( ¤ttime_mutex ); + ldap_pvt_thread_mutex_unlock( &gmtime_mutex ); bv.bv_val = buf; bv.bv_len = strlen( bv.bv_val ); attr_merge( e, "createtimestamp", bvals ); + + return LDAP_SUCCESS; }