Read config tree from back-ldif

[openldap] / servers / slapd / syntax.c

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index 688779f2f927f7ba4ba41ea2dbd6714e2f2ff5b5..0469e308cb9b2a64de156106d7b837252021e6ca 100644 (file)
--- a/servers/slapd/syntax.c
+++ b/servers/slapd/syntax.c
@@ -1,8 +1,17 @@
 /* syntax.c - routines to manage syntax definitions */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * 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 the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -14,7 +23,6 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "ldap_pvt.h"
 
 struct sindexrec {
        char            *sir_name;
@@ -96,12 +104,7 @@ syn_insert(
                sir = (struct sindexrec *)
                        SLAP_CALLOC( 1, sizeof(struct sindexrec) );
                if( sir == NULL ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, ERR, 
-                               "syn_insert: SLAP_CALLOC Error\n", 0, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY, "SLAP_CALLOC Error\n", 0, 0, 0 );
-#endif
                        return LDAP_OTHER;
                }
                sir->sir_name = ssyn->ssyn_oid;
@@ -130,12 +133,7 @@ syn_add(
 
        ssyn = (Syntax *) SLAP_CALLOC( 1, sizeof(Syntax) );
        if( ssyn == NULL ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, ERR, 
-                       "syn_add: SLAP_CALLOC Error\n", 0, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY, "SLAP_CALLOC Error\n", 0, 0, 0 );
-#endif
                return LDAP_OTHER;
        }
 
@@ -172,14 +170,8 @@ register_syntax(
 
        syn = ldap_str2syntax( def->sd_desc, &code, &err, LDAP_SCHEMA_ALLOW_ALL);
        if ( !syn ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( CONFIG, ERR, 
-                       "register_syntax: Error - %s before %s in %s.\n",
-                       ldap_scherr2str(code), err, def->sd_desc );
-#else
                Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s before %s in %s\n",
                    ldap_scherr2str(code), err, def->sd_desc );
-#endif
 
                return( -1 );
        }
@@ -189,14 +181,8 @@ register_syntax(
        ldap_memfree( syn );
 
        if ( code ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( CONFIG, ERR, 
-                       "register_syntax: Error - %s %s in %s\n", 
-                       scherr2str(code), err, def->sd_desc );
-#else
                Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s %s in %s\n",
                    scherr2str(code), err, def->sd_desc );
-#endif
 
                return( -1 );
        }
@@ -226,14 +212,8 @@ syn_schema_info( Entry *e )
                        return -1;
                }
 #if 0
-#ifdef NEW_LOGGING
-               LDAP_LOG( config, ENTRY,
-                          "syn_schema_info: Merging syn [%ld] %s\n",
-                          (long)val.bv_len, val.bv_val, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE, "Merging syn [%ld] %s\n",
               (long) val.bv_len, val.bv_val, 0 );
-#endif
 #endif
 
                nval.bv_val = syn->ssyn_oid;