On Sat, Apr 30, 2016 at 06:32:37PM -0600, Jonathan Matthew wrote:
> CVSROOT: /cvs
> Module name: src
> Changes by: jmatt...@cvs.openbsd.org 2016/04/30 18:32:37
>
> Modified files:
> usr.sbin/ldapd : Makefile conn.c ldapd.c ldapd.h ldape.c parse.y
> Added files:
> usr.sbin/ldapd : evbuffer_tls.c evbuffer_tls.h
> Removed files:
> usr.sbin/ldapd : ssl.c ssl_privsep.c
>
> Log message:
> convert ldapd to use the libtls api, bringing in a copy of the evbuffer_tls
> code from syslogd.
>
> ok beck@ benno@
>
This broke the build of ldapctl. Patch below seems to fix it, but I
don't have the means to test it.
Index: usr.sbin/ldapctl/Makefile
===================================================================
RCS file: /var/cvs/src/usr.sbin/ldapctl/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- usr.sbin/ldapctl/Makefile 3 Nov 2010 14:17:01 -0000 1.5
+++ usr.sbin/ldapctl/Makefile 1 May 2016 10:14:44 -0000
@@ -7,8 +7,8 @@ MAN= ldapctl.8
SRCS= ldapctl.c parse.y btree.c log.c ber.c util.c \
index.c attributes.c schema.c syntax.c matching.c
-LDADD= -levent -lcrypto -lz -lutil
-DPADD= ${LIBEVENT} ${LIBCRYPTO} ${LIBZ} ${LIBUTIL}
+LDADD= -ltls -levent -lz -lutil
+DPADD= ${LIBTLS} ${LIBEVENT} ${LIBZ} ${LIBUTIL}
CFLAGS+= -I${.CURDIR}/../ldapd
CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes
CFLAGS+= -Wmissing-declarations
