X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Flog.c;h=6a390891d463c49949a3e2c02537464bc85c34cf;hb=63e843d2003ddf20f3725ad439991e769ffc792a;hp=2fd6e4d454c53d7e586ef7906777a3de47cf4760;hpb=152829be87dbff64388e3771807dad467e2d1401;p=openldap

diff --git a/servers/slapd/back-monitor/log.c b/servers/slapd/back-monitor/log.c
index 2fd6e4d454..6a390891d4 100644
--- a/servers/slapd/back-monitor/log.c
+++ b/servers/slapd/back-monitor/log.c
@@ -1,34 +1,22 @@
 /* log.c - deal with log subsystem */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2001-2005 The OpenLDAP Foundation.
+ * Portions Copyright 2001-2003 Pierangelo Masarati.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/*
- * Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
- * 
- * This work has beed deveolped for the OpenLDAP Foundation 
- * in the hope that it may be useful to the Open Source community, 
- * but WITHOUT ANY WARRANTY.
- * 
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- * 
- * 1. The author and SysNet s.n.c. are not responsible for the consequences
- *    of use of this software, no matter how awful, even if they arise from
- *    flaws in it.
- * 
- * 2. The origin of this software must not be misrepresented, either by
- *    explicit claim or by omission.  Since few users ever read sources,
- *    credits should appear in the documentation.
- * 
- * 3. Altered versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.  Since few users
- *    ever read sources, credits should appear in the documentation.
- *    SysNet s.n.c. cannot be responsible for the consequences of the
- *    alterations.
- * 
- * 4. This notice may not be removed or altered.
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Pierangelo Masarati for inclusion
+ * in OpenLDAP Software.
  */
 
 #include "portable.h"
@@ -38,10 +26,22 @@
 #include <ac/string.h>
 
 #include "slap.h"
+#include <lber_pvt.h>
 #include "lutil.h"
 #include "ldif.h"
 #include "back-monitor.h"
 
+static int
+monitor_subsys_log_destroy(
+	BackendDB		*be,
+	monitor_subsys_t	*ms );
+
+static int 
+monitor_subsys_log_modify( 
+	Operation		*op,
+	SlapReply		*rs,
+	Entry 			*e );
+
 /*
  * log mutex
  */
@@ -49,27 +49,28 @@ ldap_pvt_thread_mutex_t		monitor_log_mutex;
 
 static struct {
 	int i;
-	const char *s;
+	struct berval s;
+	struct berval n;
 } int_2_level[] = {
-	{ LDAP_DEBUG_TRACE,	"Trace" },
-	{ LDAP_DEBUG_PACKETS,	"Packets" },
-	{ LDAP_DEBUG_ARGS,	"Args" },
-	{ LDAP_DEBUG_CONNS,	"Conns" },
-	{ LDAP_DEBUG_BER,	"BER" },
-	{ LDAP_DEBUG_FILTER,	"Filter" },
-	{ LDAP_DEBUG_CONFIG,	"Config" },	/* useless */
-	{ LDAP_DEBUG_ACL,	"ACL" },
-	{ LDAP_DEBUG_STATS,	"Stats" },
-	{ LDAP_DEBUG_STATS2,	"Stats2" },
-	{ LDAP_DEBUG_SHELL,	"Shell" },
-	{ LDAP_DEBUG_PARSE,	"Parse" },
-	{ LDAP_DEBUG_CACHE,	"Cache" },
-	{ LDAP_DEBUG_INDEX,	"Index" },
-	{ 0,			NULL }
+	{ LDAP_DEBUG_TRACE,	BER_BVC("Trace"),	BER_BVNULL },
+	{ LDAP_DEBUG_PACKETS,	BER_BVC("Packets"),	BER_BVNULL },
+	{ LDAP_DEBUG_ARGS,	BER_BVC("Args"),	BER_BVNULL },
+	{ LDAP_DEBUG_CONNS,	BER_BVC("Conns"),	BER_BVNULL },
+	{ LDAP_DEBUG_BER,	BER_BVC("BER"),	BER_BVNULL },
+	{ LDAP_DEBUG_FILTER,	BER_BVC("Filter"),	BER_BVNULL },
+	{ LDAP_DEBUG_CONFIG,	BER_BVC("Config"),	BER_BVNULL },	/* useless */
+	{ LDAP_DEBUG_ACL,	BER_BVC("ACL"),	BER_BVNULL },
+	{ LDAP_DEBUG_STATS,	BER_BVC("Stats"),	BER_BVNULL },
+	{ LDAP_DEBUG_STATS2,	BER_BVC("Stats2"),	BER_BVNULL },
+	{ LDAP_DEBUG_SHELL,	BER_BVC("Shell"),	BER_BVNULL },
+	{ LDAP_DEBUG_PARSE,	BER_BVC("Parse"),	BER_BVNULL },
+	{ LDAP_DEBUG_CACHE,	BER_BVC("Cache"),	BER_BVNULL },
+	{ LDAP_DEBUG_INDEX,	BER_BVC("Index"),	BER_BVNULL },
+	{ 0,			BER_BVNULL,	BER_BVNULL }
 };
 
-static int loglevel2int( const char *str );
-static const char * int2loglevel( int n );
+static int loglevel2int( struct berval *l );
+static int int2loglevel( int n );
 
 static int add_values( Entry *e, Modification *mod, int *newlevel );
 static int delete_values( Entry *e, Modification *mod, int *newlevel );
@@ -80,44 +81,49 @@ static int replace_values( Entry *e, Modification *mod, int *newlevel );
  */
 int
 monitor_subsys_log_init(
-	BackendDB	*be
-)
+	BackendDB		*be,
+	monitor_subsys_t	*ms )
 {
-	struct monitorinfo	*mi;
-	Entry			*e;
-	int			i;
-	struct berval 		bv[2];
+	monitor_info_t	*mi;
+	Entry		*e;
+	int		i;
+
+	ms->mss_destroy = monitor_subsys_log_destroy;
+	ms->mss_modify = monitor_subsys_log_modify;
 
 	ldap_pvt_thread_mutex_init( &monitor_log_mutex );
 
-	mi = ( struct monitorinfo * )be->be_private;
+	mi = ( monitor_info_t * )be->be_private;
 
-	if ( monitor_cache_get( mi, &monitor_subsys[SLAPD_MONITOR_LOG].mss_ndn, 
+	if ( monitor_cache_get( mi, &ms->mss_ndn, 
 				&e ) ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, CRIT,
-			"monitor_subsys_log_init: "
-			"unable to get entry '%s'\n",
-			monitor_subsys[SLAPD_MONITOR_LOG].mss_ndn.bv_val, 0, 0 );
-#else
 		Debug( LDAP_DEBUG_ANY,
 			"monitor_subsys_log_init: "
-			"unable to get entry '%s'\n%s%s",
-			monitor_subsys[SLAPD_MONITOR_LOG].mss_ndn.bv_val, 
-			"", "" );
-#endif
+			"unable to get entry \"%s\"\n",
+			ms->mss_ndn.bv_val, 0, 0 );
 		return( -1 );
 	}
 
-	bv[1].bv_val = NULL;
-
-	/* initialize the debug level */
+	/* initialize the debug level(s) */
 	for ( i = 0; int_2_level[ i ].i != 0; i++ ) {
-		if ( int_2_level[ i ].i & ldap_syslog ) {
-			bv[0].bv_val = ( char * )int_2_level[ i ].s;
-			bv[0].bv_len = strlen( bv[0].bv_val );
+		if ( mi->mi_ad_managedInfo->ad_type->sat_equality->smr_normalize ) {
+			int	rc;
+
+			rc = (*mi->mi_ad_managedInfo->ad_type->sat_equality->smr_normalize)(
+					SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+					mi->mi_ad_managedInfo->ad_type->sat_syntax,
+					mi->mi_ad_managedInfo->ad_type->sat_equality,
+					&int_2_level[ i ].s,
+					&int_2_level[ i ].n, NULL );
+			if ( rc ) {
+				return( -1 );
+			}
+		}
 
-			attr_mergeit( e, monitor_ad_desc, bv );
+		if ( int_2_level[ i ].i & ldap_syslog ) {
+			attr_merge_one( e, mi->mi_ad_managedInfo,
+					&int_2_level[ i ].s,
+					&int_2_level[ i ].n );
 		}
 	}
 
@@ -126,16 +132,33 @@ monitor_subsys_log_init(
 	return( 0 );
 }
 
-int 
+static int
+monitor_subsys_log_destroy(
+	BackendDB		*be,
+	monitor_subsys_t	*ms )
+{
+	int		i;
+
+	for ( i = 0; int_2_level[ i ].i != 0; i++ ) {
+		if ( !BER_BVISNULL( &int_2_level[ i ].n ) ) {
+			ch_free( int_2_level[ i ].n.bv_val );
+		}
+	}
+
+	return 0;
+}
+
+static int 
 monitor_subsys_log_modify( 
-	struct monitorinfo 	*mi,
-	Entry 			*e,
-	Modifications		*modlist
-)
+	Operation		*op,
+	SlapReply		*rs,
+	Entry 			*e )
 {
+	monitor_info_t	*mi = ( monitor_info_t * )op->o_bd->be_private;
 	int		rc = LDAP_OTHER;
 	int		newlevel = ldap_syslog;
 	Attribute	*save_attrs;
+	Modifications	*modlist = op->oq_modify.rs_modlist;
 	Modifications	*ml;
 
 	ldap_pvt_thread_mutex_lock( &monitor_log_mutex );
@@ -147,22 +170,23 @@ monitor_subsys_log_modify(
 		Modification	*mod = &ml->sml_mod;
 
 		/*
-		 * accept all operational attributes
+		 * accept all operational attributes;
+		 * this includes modifersName and modifyTimestamp
+		 * if lastmod is "on"
 		 */
 		if ( is_at_operational( mod->sm_desc->ad_type ) ) {
 			( void ) attr_delete( &e->e_attrs, mod->sm_desc );
-			rc = attr_mergeit( e, mod->sm_desc, mod->sm_bvalues );
-			if ( rc != 0 ) {
-				rc = LDAP_OTHER;
+			rc = rs->sr_err = attr_merge( e, mod->sm_desc, mod->sm_values, mod->sm_nvalues );
+			if ( rc != LDAP_SUCCESS ) {
 				break;
 			}
 			continue;
 
 		/*
-		 * only the monitor description attribute can be modified
+		 * only the "managedInfo" attribute can be modified
 		 */
-		} else if ( mod->sm_desc != monitor_ad_desc ) {
-			rc = LDAP_UNWILLING_TO_PERFORM;
+		} else if ( mod->sm_desc != mi->mi_ad_managedInfo ) {
+			rc = rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
 			break;
 		}
 
@@ -185,28 +209,28 @@ monitor_subsys_log_modify(
 		}
 
 		if ( rc != LDAP_SUCCESS ) {
+			rs->sr_err = rc;
 			break;
 		}
 	}
 
 	/* set the new debug level */
 	if ( rc == LDAP_SUCCESS ) {
-		const char *text;
-		static char textbuf[1024];
+		const char	*text;
+		static char	textbuf[ BACKMONITOR_BUFSIZE ];
 
-#if 0 	/* need op */
 		/* check for abandon */
 		if ( op->o_abandon ) {
-			rc = SLAPD_ABANDON;
+			rc = rs->sr_err = SLAPD_ABANDON;
 
 			goto cleanup;
 		}
-#endif
 
 		/* check that the entry still obeys the schema */
-		rc = entry_schema_check( be_monitor, e, save_attrs, 
-				&text, textbuf, sizeof( textbuf ) );
+		rc = entry_schema_check( op, e, save_attrs, 0,
+			&text, textbuf, sizeof( textbuf ) );
 		if ( rc != LDAP_SUCCESS ) {
+			rs->sr_err = rc;
 			goto cleanup;
 		}
 
@@ -235,16 +259,24 @@ cleanup:;
 	
 	ldap_pvt_thread_mutex_unlock( &monitor_log_mutex );
 
-	return( rc );
+	if ( rc == LDAP_SUCCESS ) {
+		rc = SLAP_CB_CONTINUE;
+	}
+
+	return rc;
 }
 
 static int
-loglevel2int( const char *str )
+loglevel2int( struct berval *l )
 {
 	int		i;
 	
 	for ( i = 0; int_2_level[ i ].i != 0; i++ ) {
-		if ( strcasecmp( str, int_2_level[ i ].s ) == 0 ) {
+		if ( l->bv_len != int_2_level[ i ].s.bv_len ) {
+			continue;
+		}
+
+		if ( strcasecmp( l->bv_val, int_2_level[ i ].s.bv_val ) == 0 ) {
 			return int_2_level[ i ].i;
 		}
 	}
@@ -252,18 +284,18 @@ loglevel2int( const char *str )
 	return 0;
 }
 
-static const char *
+static int
 int2loglevel( int n )
 {
 	int		i;
 	
 	for ( i = 0; int_2_level[ i ].i != 0; i++ ) {
 		if ( int_2_level[ i ].i == n ) {
-			return int_2_level[ i ].s;
+			return i;
 		}
 	}
 
-	return NULL;
+	return -1;
 }
 
 static int
@@ -271,21 +303,28 @@ check_constraints( Modification *mod, int *newlevel )
 {
 	int		i;
 
-	for ( i = 0; mod->sm_bvalues && mod->sm_bvalues[i].bv_val != NULL; i++ ) {
-		int l;
-		const char *s;
-		ber_len_t len;
+	for ( i = 0; mod->sm_values && !BER_BVISNULL( &mod->sm_values[ i ] ); i++ ) {
+		int		l;
 		
-		l = loglevel2int( mod->sm_bvalues[i].bv_val );
+		l = loglevel2int( &mod->sm_values[ i ] );
 		if ( !l ) {
 			return LDAP_CONSTRAINT_VIOLATION;
 		}
 
-		s = int2loglevel( l );
-		len = strlen( s );
-		assert( len == mod->sm_bvalues[i].bv_len );
+		if ( ( l = int2loglevel( l ) ) == -1 ) {
+			return LDAP_OTHER;
+		}
+
+		assert( int_2_level[ l ].s.bv_len
+				== mod->sm_values[ i ].bv_len );
 		
-		AC_MEMCPY( mod->sm_bvalues[i].bv_val, s, len );
+		AC_MEMCPY( mod->sm_values[ i ].bv_val,
+				int_2_level[ l ].s.bv_val,
+				int_2_level[ l ].s.bv_len );
+
+		AC_MEMCPY( mod->sm_nvalues[ i ].bv_val,
+				int_2_level[ l ].n.bv_val,
+				int_2_level[ l ].n.bv_len );
 
 		*newlevel |= l;
 	}
@@ -308,36 +347,29 @@ add_values( Entry *e, Modification *mod, int *newlevel )
 	a = attr_find( e->e_attrs, mod->sm_desc );
 
 	if ( a != NULL ) {
-		/* "description" SHOULD have appropriate rules ... */
+		/* "managedInfo" SHOULD have appropriate rules ... */
 		if ( mr == NULL || !mr->smr_match ) {
 			return LDAP_INAPPROPRIATE_MATCHING;
 		}
 
-		for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
+		for ( i = 0; !BER_BVISNULL( &mod->sm_values[ i ] ); i++ ) {
 			int rc;
 			int j;
 			const char *text = NULL;
 			struct berval asserted;
 
-			rc = value_normalize( mod->sm_desc,
-				SLAP_MR_EQUALITY,
-				&mod->sm_bvalues[i],
-				&asserted,
-				&text );
+			rc = asserted_value_validate_normalize(
+				mod->sm_desc, mr, SLAP_MR_EQUALITY,
+				&mod->sm_values[ i ], &asserted, &text, NULL );
 
 			if ( rc != LDAP_SUCCESS ) {
 				return rc;
 			}
 
-			for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
+			for ( j = 0; !BER_BVISNULL( &a->a_vals[ j ] ); j++ ) {
 				int match;
 				int rc = value_match( &match, mod->sm_desc, mr,
-#ifdef SLAP_NVALUES
-					0,
-#else
-					SLAP_MR_ATTRIBUTE_SYNTAX_MATCH,
-#endif
-					&a->a_vals[j], &asserted, &text );
+					0, &a->a_vals[ j ], &asserted, &text );
 
 				if ( rc == LDAP_SUCCESS && match == 0 ) {
 					free( asserted.bv_val );
@@ -350,9 +382,10 @@ add_values( Entry *e, Modification *mod, int *newlevel )
 	}
 
 	/* no - add them */
-	if ( attr_mergeit( e, mod->sm_desc, mod->sm_bvalues ) != 0 ) {
+	rc = attr_merge( e, mod->sm_desc, mod->sm_values, mod->sm_nvalues );
+	if ( rc != LDAP_SUCCESS ) {
 		/* this should return result of attr_mergeit */
-		return LDAP_OTHER;
+		return rc;
 	}
 
 	return LDAP_SUCCESS;
@@ -373,7 +406,7 @@ delete_values( Entry *e, Modification *mod, int *newlevel )
 	*newlevel &= ~nl;
 
 	/* delete the entire attribute */
-	if ( mod->sm_bvalues == NULL ) {
+	if ( mod->sm_values == NULL ) {
 		int rc = attr_delete( &e->e_attrs, mod->sm_desc );
 
 		if ( rc ) {
@@ -397,30 +430,24 @@ delete_values( Entry *e, Modification *mod, int *newlevel )
 	}
 
 	/* find each value to delete */
-	for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
+	for ( i = 0; !BER_BVISNULL( &mod->sm_values[ i ] ); i++ ) {
 		int rc;
 		const char *text = NULL;
 
 		struct berval asserted;
 
-		rc = value_normalize( mod->sm_desc,
-				SLAP_MR_EQUALITY,
-				&mod->sm_bvalues[i],
-				&asserted,
-				&text );
+		rc = asserted_value_validate_normalize(
+				mod->sm_desc, mr, SLAP_MR_EQUALITY,
+				&mod->sm_values[ i ], &asserted, &text, NULL );
 
 		if( rc != LDAP_SUCCESS ) return rc;
 
 		found = 0;
-		for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
+		for ( j = 0; !BER_BVISNULL( &a->a_vals[ j ] ); j++ ) {
 			int match;
 			int rc = value_match( &match, mod->sm_desc, mr,
-#ifdef SLAP_NVALUES
 				0,
-#else
-				SLAP_MR_ATTRIBUTE_SYNTAX_MATCH,
-#endif
-				&a->a_vals[j], &asserted, &text );
+				&a->a_vals[ j ], &asserted, &text );
 
 			if( rc == LDAP_SUCCESS && match != 0 ) {
 				continue;
@@ -430,11 +457,11 @@ delete_values( Entry *e, Modification *mod, int *newlevel )
 			found = 1;
 
 			/* delete it */
-			free( a->a_vals[j].bv_val );
-			for ( k = j + 1; a->a_vals[k].bv_val != NULL; k++ ) {
-				a->a_vals[k - 1] = a->a_vals[k];
+			free( a->a_vals[ j ].bv_val );
+			for ( k = j + 1; !BER_BVISNULL( &a->a_vals[ k ] ); k++ ) {
+				a->a_vals[ k - 1 ] = a->a_vals[ k ];
 			}
-			a->a_vals[k - 1].bv_val = NULL;
+			BER_BVZERO( &a->a_vals[ k - 1 ] );
 
 			break;
 		}
@@ -448,7 +475,7 @@ delete_values( Entry *e, Modification *mod, int *newlevel )
 	}
 
 	/* if no values remain, delete the entire attribute */
-	if ( a->a_vals[0].bv_val == NULL ) {
+	if ( BER_BVISNULL( &a->a_vals[ 0 ] ) ) {
 		/* should already be zero */
 		*newlevel = 0;
 		
@@ -477,9 +504,11 @@ replace_values( Entry *e, Modification *mod, int *newlevel )
 		return rc;
 	}
 
-	if ( mod->sm_bvalues != NULL &&
-		attr_mergeit( e, mod->sm_desc, mod->sm_bvalues ) != 0 ) {
-		return LDAP_OTHER;
+	if ( mod->sm_values != NULL ) {
+		rc = attr_merge( e, mod->sm_desc, mod->sm_values, mod->sm_nvalues );
+		if ( rc != LDAP_SUCCESS ) {
+			return rc;
+		}
 	}
 
 	return LDAP_SUCCESS;