[src/trunk]: src/external/bsd/openldap/dist/servers/slapd resolve conflict

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b3ae95d88428
branches:  trunk
changeset: 351296:b3ae95d88428
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Feb 09 02:20:33 2017 +0000

description:
resolve conflict

diffstat:

 external/bsd/openldap/dist/servers/slapd/filter.c |  11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diffs (36 lines):

diff -r 209f8500553c -r b3ae95d88428 external/bsd/openldap/dist/servers/slapd/filter.c
--- a/external/bsd/openldap/dist/servers/slapd/filter.c Thu Feb 09 02:18:13 2017 +0000
+++ b/external/bsd/openldap/dist/servers/slapd/filter.c Thu Feb 09 02:20:33 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: filter.c,v 1.3 2017/02/09 01:53:51 christos Exp $      */
+/*     $NetBSD: filter.c,v 1.4 2017/02/09 02:20:33 christos Exp $      */
 
 /* filter.c - routines for parsing and dealing with filters */
 /* $OpenLDAP$ */
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: filter.c,v 1.3 2017/02/09 01:53:51 christos Exp $");
+__RCSID("$NetBSD: filter.c,v 1.4 2017/02/09 02:20:33 christos Exp $");
 
 #include "portable.h"
 
@@ -1163,17 +1163,10 @@
 void
 vrFilter_free( Operation *op, ValuesReturnFilter *vrf )
 {
-<<<<<<< filter.c
-       ValuesReturnFilter      *next;
-
-       for ( p = vrf; vrf != NULL; vrf = next ) {
-               next = vrf->vrf_next;
-=======
        ValuesReturnFilter      *next;
 
        for ( ; vrf != NULL; vrf = next ) {
                next = vrf->vrf_next;
->>>>>>> 1.1.1.5
 
                switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) {
                case LDAP_FILTER_PRESENT: