diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2012-09-01 16:09:16 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2012-09-01 16:09:16 +0000 |
| commit | 16df9b77abda568bc5f86ac5bdc5cb8663022f65 (patch) | |
| tree | 2a9438d02687515195b7023a44374e39e6caeda0 /usr.sbin/smtpd/smtpd.c | |
| parent | 16ab26e5cd4af8121f23c822ef7890e7dcef1fed (diff) | |
- remove crypto_backend
- remove support for encrypted queue, it will be reintroduced later after
pouring more thinking into it
if you had it enabled, flush your queue before updating
Diffstat (limited to 'usr.sbin/smtpd/smtpd.c')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index d79826d66e2..ad2dbffd42b 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.167 2012/08/29 16:26:17 gilles Exp $ */ +/* $OpenBSD: smtpd.c,v 1.168 2012/09/01 16:09:14 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -532,24 +532,6 @@ main(int argc, char *argv[]) if (parse_config(&smtpd, conffile, opts)) exit(1); - if (env->sc_queue_crypto_key) { - if (! crypto_setup(env->sc_queue_crypto_cipher, - env->sc_queue_crypto_digest, - env->sc_queue_crypto_key)) - errx(1, "crypto: setup failed"); - bzero(env->sc_queue_crypto_cipher, strlen(env->sc_queue_crypto_cipher)); - bzero(env->sc_queue_crypto_digest, strlen(env->sc_queue_crypto_digest)); - bzero(env->sc_queue_crypto_key, strlen(env->sc_queue_crypto_key)); - free(env->sc_queue_crypto_cipher); - free(env->sc_queue_crypto_digest); - free(env->sc_queue_crypto_key); - - env->sc_queue_crypto_cipher = NULL; - env->sc_queue_crypto_digest = NULL; - env->sc_queue_crypto_key = NULL; - } - - if (strlcpy(env->sc_conffile, conffile, MAXPATHLEN) >= MAXPATHLEN) errx(1, "config file exceeds MAXPATHLEN"); |