From 872b0a09fd4623cb1562bb6c93cc69fa682751a3 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 14 May 2005 18:52:15 +0000 Subject: [PATCH] ITS#3725 fix --- servers/slapd/add.c | 2 +- servers/slapd/modify.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/servers/slapd/add.c b/servers/slapd/add.c index 77e3dea9db..39480b5c93 100644 --- a/servers/slapd/add.c +++ b/servers/slapd/add.c @@ -264,7 +264,7 @@ fe_op_add( Operation *op, SlapReply *rs ) goto done; } - rs->sr_err = slap_mods_no_user_mod_check( op, modlist, + rs->sr_err = slap_mods_obsolete_check( op, modlist, &rs->sr_text, textbuf, textlen ); if ( rs->sr_err != LDAP_SUCCESS ) { diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c index 49570835a4..77b0d5013a 100644 --- a/servers/slapd/modify.c +++ b/servers/slapd/modify.c @@ -575,15 +575,16 @@ slap_mods_no_user_mod_check( for ( ; ml != NULL; ml = ml->sml_next ) { if ( !is_at_no_user_mod( ml->sml_desc->ad_type ) ) continue; - if ( ml->sml_desc->ad_type->sat_flags & SLAP_AT_MANAGEABLE ) { - continue; - } - if( get_manageDIT( op )) { + if ( ml->sml_desc->ad_type->sat_flags & SLAP_AT_MANAGEABLE ) { + continue; + } + /* attribute not manageable */ snprintf( textbuf, textlen, "%s: no-user-modification attribute not manageable", ml->sml_type.bv_val ); + } else { /* user modification disallowed */ snprintf( textbuf, textlen, -- 2.39.2