add logs; fix bug in group/dn selection logic

[openldap] / servers / slapd / value.c

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index 01ee39b08a0ea4ac7306490795575795984a91e8..893803def992d74cba5d292812aa852b12c9c1db 100644 (file)
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -1,8 +1,28 @@
 /* value.c - routines for dealing with values */
 /* $OpenLDAP$ */
+/* 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>.
+ */
 /*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ * 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.
  */
 
 #include "portable.h"
@@ -21,8 +41,7 @@
 int
 value_add( 
     BerVarray *vals,
-    BerVarray addvals
-)
+    BerVarray addvals )
 {
        int     n, nn;
        BerVarray v2;
@@ -76,8 +95,7 @@ value_add(
 int
 value_add_one( 
     BerVarray *vals,
-    struct berval *addval
-)
+    struct berval *addval )
 {
        int     n;
        BerVarray v2;
@@ -197,8 +215,8 @@ value_match(
        const char ** text )
 {
        int rc;
-       struct berval nv1 = { 0, NULL };
-       struct berval nv2 = { 0, NULL };
+       struct berval nv1 = BER_BVNULL;
+       struct berval nv2 = BER_BVNULL;
 
        assert( mr != NULL );
 
@@ -226,7 +244,7 @@ int value_find_ex(
 {
        int     i;
        int rc;
-       struct berval nval = { 0, NULL };
+       struct berval nval = BER_BVNULL;
        MatchingRule *mr = ad->ad_type->sat_equality;
 
        if( mr == NULL || !mr->smr_match ) {