summaryrefslogtreecommitdiff
path: root/usr.sbin/ldapd/conn.c
diff options
context:
space:
mode:
authorMartin Hedenfal <martinh@cvs.openbsd.org>2010-06-29 21:00:35 +0000
committerMartin Hedenfal <martinh@cvs.openbsd.org>2010-06-29 21:00:35 +0000
commit8b1d69a2bdc2868a52d59070d07af600e681646f (patch)
tree2055a13f18f43933ad9c9c25ed9fa27482548067 /usr.sbin/ldapd/conn.c
parent9e9fc6ba762367e8a978a2f8baf109ace827ddb5 (diff)
Remember on what listener a connection got from, and return protocol error
if trying to use starttls without a configured certificate, instead of just blocking the client.
Diffstat (limited to 'usr.sbin/ldapd/conn.c')
-rw-r--r--usr.sbin/ldapd/conn.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/ldapd/conn.c b/usr.sbin/ldapd/conn.c
index a69af30b612..abd71912988 100644
--- a/usr.sbin/ldapd/conn.c
+++ b/usr.sbin/ldapd/conn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conn.c,v 1.3 2010/06/27 18:31:13 martinh Exp $ */
+/* $OpenBSD: conn.c,v 1.4 2010/06/29 21:00:34 martinh Exp $ */
/*
* Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
@@ -266,6 +266,7 @@ conn_accept(int fd, short why, void *data)
conn->s_l = l;
ber_set_application(&conn->ber, ldap_application);
conn->fd = afd;
+ conn->listener = l;
if (l->flags & F_LDAPS) {
ssl_session_init(conn);