More unifdef SLAPD_MULTIMASTER cleanup

[openldap] / servers / slapd / syntax.c

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index d808d8126a1d98dde21bfeaf49da65fb334a818b..61ed5f740c74b6d4a111927512c22e55295dd8eb 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-2006 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;
        }
 
@@ -151,7 +149,6 @@ syn_add(
        ssyn->ssyn_oidlen = strlen(syn->syn_oid);
        ssyn->ssyn_flags = def->sd_flags;
        ssyn->ssyn_validate = def->sd_validate;
-       ssyn->ssyn_normalize = def->sd_normalize;
        ssyn->ssyn_pretty = def->sd_pretty;
 
 #ifdef SLAPD_BINARY_CONVERSION
@@ -173,47 +170,34 @@ 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 );
        }
 
        code = syn_add( syn, def, &err );
 
-       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
+               ldap_syntax_free( syn );
 
                return( -1 );
        }
 
+       ldap_memfree( syn );
+
        return( 0 );
 }
 
 int
 syn_schema_info( Entry *e )
 {
-       struct berval   vals[2];
-       Syntax          *syn;
-
        AttributeDescription *ad_ldapSyntaxes = slap_schema.si_ad_ldapSyntaxes;
-
-       vals[1].bv_val = NULL;
+       Syntax          *syn;
+       struct berval   val;
+       struct berval   nval;
 
        LDAP_SLIST_FOREACH(syn, &syn_list, ssyn_next ) {
                if ( ! syn->ssyn_validate ) {
@@ -225,29 +209,22 @@ syn_schema_info( Entry *e )
                        continue;
                }
 
-               if ( ldap_syntax2bv( &syn->ssyn_syn, vals ) == NULL ) {
+               if ( ldap_syntax2bv( &syn->ssyn_syn, &val ) == NULL ) {
                        return -1;
                }
 #if 0
-#ifdef NEW_LOGGING
-               LDAP_LOG( config, ENTRY,
-                          "syn_schema_info: Merging syn [%ld] %s\n",
-                          (long)vals[0].bv_len, vals[0].bv_val, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE, "Merging syn [%ld] %s\n",
-              (long) vals[0].bv_len, vals[0].bv_val, 0 );
+              (long) val.bv_len, val.bv_val, 0 );
 #endif
 
-#endif
-#ifdef SLAP_NVALUES
-               if( attr_merge( e, ad_ldapSyntaxes, vals, NULL /* FIXME */ ) )
-#else
-               if( attr_merge( e, ad_ldapSyntaxes, vals ) )
-#endif
+               nval.bv_val = syn->ssyn_oid;
+               nval.bv_len = strlen(syn->ssyn_oid);
+
+               if( attr_merge_one( e, ad_ldapSyntaxes, &val, &nval ) )
                {
                        return -1;
                }
-               ldap_memfree( vals[0].bv_val );
+               ldap_memfree( val.bv_val );
        }
        return 0;
 }