summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2009-05-19 22:41:36 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2009-05-19 22:41:36 +0000
commita33bd27ee45fb2a2292b3dcfde7cc59d1d32ff7f (patch)
treec7ef3ad11d024332ade12db78a9e9160f34ebc02
parent2fff5a30b8f61e3dfbe375fc94118d7ea9ee3118 (diff)
remove useless check on NULL ssl cert and key, the check cannot be reached
as we would exit earlier if either one is NULL. diff by giovanni <qgiovanni@gmail.com>, had been sitting in my mbox for a while, okayed by jacek and I
-rw-r--r--usr.sbin/smtpd/ssl.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/ssl.c b/usr.sbin/smtpd/ssl.c
index e921382392d..1bbdd5c6203 100644
--- a/usr.sbin/smtpd/ssl.c
+++ b/usr.sbin/smtpd/ssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.c,v 1.14 2009/05/18 20:23:35 jacekm Exp $ */
+/* $OpenBSD: ssl.c,v 1.15 2009/05/19 22:41:35 gilles Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -384,9 +384,6 @@ ssl_load_certfile(struct smtpd *env, const char *name)
return (-1);
}
- if (s->ssl_cert == NULL || s->ssl_key == NULL)
- fatal("invalid certificates");
-
SPLAY_INSERT(ssltree, &env->sc_ssl, s);
return (0);