ITS#3208: fix matchedValues parsing

[openldap] / libraries / libldap / filter.c

diff --git a/libraries/libldap/filter.c b/libraries/libldap/filter.c
index 45eebb9483418f0a6eb116bdcfd3fafdbc2a3d1c..b1468d047b842f70988f7a9b4045049302e4a626 100644 (file)
--- a/libraries/libldap/filter.c
+++ b/libraries/libldap/filter.c
@@ -1,13 +1,23 @@
+/* search.c */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/*  Portions
- *  Copyright (c) 1990 Regents of the University of Michigan.
- *  All rights reserved.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
  *
- *  search.c
+ * 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) 1990 Regents of the University of Michigan.
+ * All rights reserved.
+ */
+/* Portions Copyright (C) The Internet Society (1997).
+ * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
  */
 
 #include "portable.h"
@@ -958,7 +968,7 @@ put_vrFilter( BerElement *ber, const char *str_in )
                                0, 0, 0 );
 #endif
                        next = strchr( str, '\0' );
-                       if ( put_simple_filter( ber, str ) == -1 ) {
+                       if ( put_simple_vrFilter( ber, str ) == -1 ) {
                                rc = -1;
                                goto done;
                        }
@@ -1088,12 +1098,8 @@ put_simple_vrFilter(
                                        goto done;
                                }
                                rule = "";
-                       
-                       } else {
-                               *rule++ = '\0';
                        }
 
-
                        if ( *str == '\0' && ( !rule || *rule == '\0' ) ) {
                                /* must have either type or rule */
                                goto done;