fix database operations in tool mode (ITS#3622)

[openldap] / servers / slapd / schema.c

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 0d4b99af688e52efeee4409757992c6cca143469..bd1601ce0da03b76c69c08a3afba93f3b84c9248 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,6 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "ldap_pvt.h"
 #include "lutil.h"
 
 
@@ -46,13 +45,8 @@ schema_info( Entry **entry, const char **text )
        e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
        if( e == NULL ) {
                /* Out of memory, do something about it */
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, ERR, 
-                       "schema_info: SLAP_CALLOC failed - out of memory.\n", 0, 0,0 );
-#else
                Debug( LDAP_DEBUG_ANY, 
                        "schema_info: SLAP_CALLOC failed - out of memory.\n", 0, 0, 0 );
-#endif
                *text = "out of memory";
                return LDAP_OTHER;
        }