slight improvements; doesn't work yet

[openldap] / servers / slapd / syntax.c

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index a255ad42d28d467b8f7f6483a7ed32439110ead2..fea075aebc705aa9ea3d33fec4c6e59f77e7f9f5 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-2004 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"
@@ -151,9 +160,6 @@ syn_add(
        ssyn->ssyn_oidlen = strlen(syn->syn_oid);
        ssyn->ssyn_flags = def->sd_flags;
        ssyn->ssyn_validate = def->sd_validate;
-#ifndef SLAP_NVALUES
-       ssyn->ssyn_normalize = def->sd_normalize;
-#endif
        ssyn->ssyn_pretty = def->sd_pretty;
 
 #ifdef SLAPD_BINARY_CONVERSION
@@ -213,9 +219,7 @@ syn_schema_info( Entry *e )
        AttributeDescription *ad_ldapSyntaxes = slap_schema.si_ad_ldapSyntaxes;
        Syntax          *syn;
        struct berval   val;
-#ifdef SLAP_NVALUES
        struct berval   nval;
-#endif
 
        LDAP_SLIST_FOREACH(syn, &syn_list, ssyn_next ) {
                if ( ! syn->ssyn_validate ) {
@@ -241,14 +245,10 @@ syn_schema_info( Entry *e )
 #endif
 #endif
 
-#ifdef SLAP_NVALUES
                nval.bv_val = syn->ssyn_oid;
                nval.bv_len = strlen(syn->ssyn_oid);
 
                if( attr_merge_one( e, ad_ldapSyntaxes, &val, &nval ) )
-#else
-               if( attr_merge_one( e, ad_ldapSyntaxes, &val ) )
-#endif
                {
                        return -1;
                }