allow backwards compatibility for 'T' option (single char)

[openldap] / servers / slapd / at.c

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 45aaae32da567d5fa833315fcbe3c29876f6580c..4d0ebcb7d492dbc9019fb804f93d0d6f44d33393 100644 (file)
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -1,9 +1,18 @@
+/* at.c - routines for dealing with attribute types */
 /* $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>.
  */
-/* at.c - routines for dealing with attribute types */
 
 #include "portable.h"
 
@@ -600,9 +609,7 @@ at_schema_info( Entry *e )
        AttributeDescription *ad_attributeTypes = slap_schema.si_ad_attributeTypes;
        AttributeType   *at;
        struct berval   val;
-#ifdef SLAP_NVALUES
        struct berval   nval;
-#endif
 
        LDAP_SLIST_FOREACH(at,&attr_list,sat_next) {
                if( at->sat_flags & SLAP_AT_HIDE ) continue;
@@ -611,14 +618,10 @@ at_schema_info( Entry *e )
                        return -1;
                }
 
-#ifdef SLAP_NVALUES
                nval.bv_val = at->sat_oid;
                nval.bv_len = strlen(at->sat_oid);
 
                if( attr_merge_one( e, ad_attributeTypes, &val, &nval ) )
-#else
-               if( attr_merge_one( e, ad_attributeTypes, &val ) )
-#endif
                {
                        return -1;
                }