When a validate function fails from within a tool, report the offending

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 7bdae990b383fd7c82a123f2dca7c2f5143f91c4..a9031b6f6ba50ab118664daf682d9218faa9b304 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -1,7 +1,7 @@
 /* init.c - initialize various things */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -14,6 +14,7 @@
 #include <ac/time.h>
 
 #include "slap.h"
+#include "lber_pvt.h"
 
 /*
  * read-only global variables or variables only written by the listener
@@ -33,6 +34,10 @@ int          ldap_syslog_level = LOG_DEBUG;
 
 BerVarray default_referral = NULL;
 
+struct berval AllUser = BER_BVC( LDAP_ALL_USER_ATTRIBUTES );
+struct berval AllOper = BER_BVC( LDAP_ALL_OPERATIONAL_ATTRIBUTES );
+struct berval NoAttrs = BER_BVC( LDAP_NO_ATTRS );
+
 /*
  * global variables that need mutex protection
  */
@@ -75,9 +80,9 @@ slap_init( int mode, const char *name )
 
        if( slapMode != SLAP_UNDEFINED_MODE ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-                          "init: %s init called twice (old=%d, new=%d)\n",
-                          name, slapMode, mode ));
+               LDAP_LOG( OPERATION, CRIT, 
+                       "init: %s init called twice (old=%d, new=%d)\n",
+                       name, slapMode, mode );
 #else
                Debug( LDAP_DEBUG_ANY,
                 "%s init: init called twice (old=%d, new=%d)\n",
@@ -93,9 +98,10 @@ slap_init( int mode, const char *name )
                case SLAP_SERVER_MODE:
                case SLAP_TOOL_MODE:
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                                  "init: %s initiation, initiated %s.\n",
-                                  name, (mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server" ));
+                       LDAP_LOG( OPERATION, DETAIL1, 
+                               "init: %s initiation, initiated %s.\n",
+                               name, (mode & SLAP_MODE) == SLAP_TOOL_MODE ? 
+                                 "tool" : "server", 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "%s init: initiated %s.\n",     name,
@@ -115,6 +121,7 @@ slap_init( int mode, const char *name )
                        ldap_pvt_thread_mutex_init( &num_ops_mutex );
                        ldap_pvt_thread_mutex_init( &num_sent_mutex );
 
+#ifdef SLAPD_MONITOR
                        {
                                int i;
                                for ( i = 0; i < SLAP_OP_LAST; i++ ) {
@@ -122,6 +129,7 @@ slap_init( int mode, const char *name )
                                        num_ops_completed_[ i ] = 0;
                                }
                        }
+#endif
 
                        ldap_pvt_thread_mutex_init( &gmtime_mutex );
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
@@ -137,8 +145,8 @@ slap_init( int mode, const char *name )
 
                default:
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                                  "init: %s init, undefined mode (%d).\n", name, mode ));
+                       LDAP_LOG( OPERATION, ERR, 
+                               "init: %s init, undefined mode (%d).\n", name, mode, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "%s init: undefined mode (%d).\n", name, mode, 0 );
@@ -156,8 +164,7 @@ int slap_startup( Backend *be )
        int rc;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-                  "slap_startup: %s started\n", slap_name ));
+       LDAP_LOG( OPERATION, CRIT, "slap_startup: %s started\n", slap_name, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE,
                "%s startup: initiated.\n",
@@ -175,8 +182,8 @@ int slap_shutdown( Backend *be )
        int rc;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-                  "slap_shutdown: %s shutdown initiated.\n", slap_name));
+       LDAP_LOG( OPERATION, CRIT, 
+               "slap_shutdown: %s shutdown initiated.\n", slap_name, 0, 0);
 #else
        Debug( LDAP_DEBUG_TRACE,
                "%s shutdown: initiated\n",
@@ -197,9 +204,8 @@ int slap_destroy(void)
        int rc;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                  "slap_destroy: %s freeing system resources.\n",
-                  slap_name ));
+       LDAP_LOG( OPERATION, INFO, 
+               "slap_destroy: %s freeing system resources.\n", slap_name, 0, 0);
 #else
        Debug( LDAP_DEBUG_TRACE,
                "%s shutdown: freeing system resources.\n",