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

[openldap] / servers / slapd / attr.c

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index a552ebad241279b85f2c7827e0ec79ac17caad96..69ca9f143980188a27a6014b8e7fa686f0af4278 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -1,9 +1,28 @@
+/* attr.c - routines for dealing with attributes */
 /* $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>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
-/* attr.c - routines for dealing with attributes */
 
 #include "portable.h"
 
@@ -123,8 +142,8 @@ attr_merge(
        Entry           *e,
        AttributeDescription *desc,
        BerVarray       vals,
-       BerVarray       nvals
-) {
+       BerVarray       nvals )
+{
        int rc;
 
        Attribute       **a;
@@ -157,8 +176,8 @@ attr_merge_normalize(
        Entry           *e,
        AttributeDescription *desc,
        BerVarray       vals,
-       void     *memctx
-) {
+       void     *memctx )
+{
        BerVarray       nvals = NULL;
        int             rc;
 
@@ -199,8 +218,8 @@ attr_merge_one(
        Entry           *e,
        AttributeDescription *desc,
        struct berval   *val,
-       struct berval   *nval
-) {
+       struct berval   *nval )
+{
        int rc;
        Attribute       **a;
 
@@ -231,8 +250,8 @@ attr_merge_normalize_one(
        Entry           *e,
        AttributeDescription *desc,
        struct berval   *val,
-       void            *memctx
-) {
+       void            *memctx )
+{
        struct berval   nval;
        struct berval   *nvalp;
        int             rc;
@@ -269,8 +288,7 @@ attr_merge_normalize_one(
 Attribute *
 attrs_find(
     Attribute  *a,
-       AttributeDescription *desc
-)
+       AttributeDescription *desc )
 {
        for ( ; a != NULL; a = a->a_next ) {
                if ( is_ad_subtype( a->a_desc, desc ) ) {
@@ -288,8 +306,7 @@ attrs_find(
 Attribute *
 attr_find(
     Attribute  *a,
-       AttributeDescription *desc
-)
+       AttributeDescription *desc )
 {
        for ( ; a != NULL; a = a->a_next ) {
                if ( ad_cmp( a->a_desc, desc ) == 0 ) {
@@ -310,8 +327,7 @@ attr_find(
 int
 attr_delete(
     Attribute  **attrs,
-       AttributeDescription *desc
-)
+       AttributeDescription *desc )
 {
        Attribute       **a;