Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
christos 2017-02-09 02:20:33 +00:00
parent 22c2d28c4e
commit e877fc1615
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
external/bsd/openldap/dist/servers/slapd/filter.c vendored
View File

@ -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 */ /* filter.c - routines for parsing and dealing with filters */
/* $OpenLDAP$ */ /* $OpenLDAP$ */
@ -27,7 +27,7 @@
*/ */
#include <sys/cdefs.h> #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" #include "portable.h"
@ -1163,17 +1163,10 @@ get_vrFilter( Operation *op, BerElement *ber,
void void
vrFilter_free( Operation *op, ValuesReturnFilter *vrf ) vrFilter_free( Operation *op, ValuesReturnFilter *vrf )
{ {
<<<<<<< filter.c
ValuesReturnFilter *next;
for ( p = vrf; vrf != NULL; vrf = next ) {
next = vrf->vrf_next;
=======
ValuesReturnFilter *next; ValuesReturnFilter *next;
for ( ; vrf != NULL; vrf = next ) { for ( ; vrf != NULL; vrf = next ) {
next = vrf->vrf_next; next = vrf->vrf_next;
>>>>>>> 1.1.1.5
switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) { switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) {
case LDAP_FILTER_PRESENT: case LDAP_FILTER_PRESENT: