CVS commit: src/external/bsd/openldap

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Thu Aug  8 13:50:58 UTC 2019

Modified Files:
        src/external/bsd/openldap/dist/build: mkversion
        src/external/bsd/openldap/dist/clients/tools: common.c
        src/external/bsd/openldap/dist/include: Makefile.in ldap_pvt.h
            ldap_queue.h portable.hin
        src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
            tls_o.c
        src/external/bsd/openldap/dist/libraries/liblutil: detach.c md5.c
            passwd.c
        src/external/bsd/openldap/dist/libraries/librewrite: session.c
        src/external/bsd/openldap/dist/servers/slapd: filter.c
        src/external/bsd/openldap/dist/servers/slapd/overlays: deref.c
        src/external/bsd/openldap/include: ldap_features.h portable.h
Removed Files:
        src/external/bsd/openldap/dist/doc/man/man5: slapd-ldbm.5
        src/external/bsd/openldap/dist/tests/scripts:
            test058-syncrepl-asymmetric

Log Message:
merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.7 -r1.8 \
    src/external/bsd/openldap/dist/clients/tools/common.c
cvs rdiff -u -r1.1.1.6 -r0 \
    src/external/bsd/openldap/dist/doc/man/man5/slapd-ldbm.5
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openldap/dist/include/Makefile.in \
    src/external/bsd/openldap/dist/include/portable.hin
cvs rdiff -u -r1.1.1.7 -r1.2 \
    src/external/bsd/openldap/dist/include/ldap_pvt.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/dist/include/ldap_queue.h
cvs rdiff -u -r1.8 -r1.9 \
    src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.9 -r1.10 \
    src/external/bsd/openldap/dist/libraries/libldap/os-local.c
cvs rdiff -u -r1.6 -r1.7 \
    src/external/bsd/openldap/dist/libraries/libldap/tls_o.c
cvs rdiff -u -r1.5 -r1.6 \
    src/external/bsd/openldap/dist/libraries/liblutil/detach.c \
    src/external/bsd/openldap/dist/libraries/liblutil/md5.c
cvs rdiff -u -r1.6 -r1.7 \
    src/external/bsd/openldap/dist/libraries/liblutil/passwd.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/bsd/openldap/dist/libraries/librewrite/session.c
cvs rdiff -u -r1.5 -r1.6 \
    src/external/bsd/openldap/dist/servers/slapd/filter.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c
cvs rdiff -u -r1.1.1.5 -r0 \
    src/external/bsd/openldap/dist/tests/scripts/test058-syncrepl-asymmetric
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/include/ldap_features.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openldap/include/portable.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.