X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodify.c;h=f9f377b683613fc7e7e44135bf4bacd1e30f0e75;hb=ed471a4d53b9bcd2cc89410743ffb4bd58b5fc05;hp=e9c7bd72b7332365930fb0b91ca65de910e4267c;hpb=1b70e1644888c477890722e45307fea60eaa3d77;p=openldap

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index e9c7bd72b7..f9f377b683 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -269,8 +269,32 @@ do_modify(
 	}
 #endif
 
-	Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MOD dn=\"%s\"\n",
-	    op->o_connid, op->o_opid, dn.bv_val, 0, 0 );
+	if ( StatslogTest( LDAP_DEBUG_STATS ) ) {
+		char abuf[BUFSIZ/2], *ptr = abuf;
+		int len = 0;
+
+		Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MOD dn=\"%s\"\n",
+			op->o_connid, op->o_opid, dn.bv_val, 0, 0 );
+
+		for ( tmp = modlist; tmp != NULL; tmp = tmp->sml_next ) {
+			if (len + 1 + tmp->sml_type.bv_len > sizeof(abuf)) {
+				Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MOD attr=%s\n",
+				    op->o_connid, op->o_opid, abuf, 0, 0 );
+	    			len = 0;
+				ptr = abuf;
+			}
+			if (len) {
+				*ptr++ = ' ';
+				len++;
+			}
+			ptr = lutil_strcopy(ptr, tmp->sml_type.bv_val);
+			len += tmp->sml_type.bv_len;
+		}
+		if (len) {
+			Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MOD attr=%s\n",
+	    			op->o_connid, op->o_opid, abuf, 0, 0 );
+		}
+	}
 
 	manageDSAit = get_manageDSAit( op );
 
@@ -324,9 +348,11 @@ do_modify(
 		 * FIXME: is this correct?
 		 */
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_modify: modify preOps failed\n"));
+		LDAP_LOG( OPERATION, INFO, "do_modify: modify preOps "
+				"failed\n", 0, 0, 0 );
 #else
-		Debug (LDAP_DEBUG_TRACE, " modify preOps failed.\n", 0, 0, 0);
+		Debug(LDAP_DEBUG_TRACE, "do_modify: modify preOps failed.\n",
+				0, 0, 0);
 #endif
 	}
 #endif /* defined( LDAP_SLAPI ) */
@@ -418,9 +444,11 @@ do_modify(
 		 * FIXME: is this correct?
 		 */
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_modify: modify postOps failed\n"));
+		LDAP_LOG( OPERATION, INFO, "do_modify: modify postOps "
+				"failed\n", 0, 0, 0 );
 #else
-		Debug (LDAP_DEBUG_TRACE, " modify postOps failed.\n", 0, 0, 0);
+		Debug(LDAP_DEBUG_TRACE, "do_modify: modify postOps "
+				"failed.\n", 0, 0, 0);
 #endif
 	}
 #endif /* defined( LDAP_SLAPI ) */
@@ -482,10 +510,10 @@ int slap_mods_check(
 			return LDAP_UNDEFINED_TYPE;
 		}
 
-		if( slap_ad_is_lang_range( ad )) {
+		if( slap_ad_is_tag_range( ad )) {
 			/* attribute requires binary transfer */
 			snprintf( textbuf, textlen,
-				"%s: inappropriate use of language range option",
+				"%s: inappropriate use of tag range option",
 				ml->sml_type.bv_val );
 			*text = textbuf;
 			return LDAP_UNDEFINED_TYPE;