Remove unused arguments from ssl_smtp_init()

ok gilles@

diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 6849b0e..1fb2ff7 100644 (file)
--- a/usr.sbin/smtpd/smtp_session.c
+++ b/usr.sbin/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: smtp_session.c,v 1.208 2014/04/29 10:18:06 reyk Exp $ */
+/*     $OpenBSD: smtp_session.c,v 1.209 2014/04/29 12:18:27 reyk Exp $ */
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -594,10 +594,7 @@ smtp_session_imsg(struct mproc *p, struct imsg *imsg)
                else
                        ssl_ctx = dict_get(env->sc_ssl_dict, s->smtpname);
 
-               ssl = ssl_smtp_init(ssl_ctx,
-                   resp_ca_cert->cert, resp_ca_cert->cert_len,
-                   resp_ca_cert->key, resp_ca_cert->key_len,
-                   smtp_sni_callback, s);
+               ssl = ssl_smtp_init(ssl_ctx, smtp_sni_callback, s);
                io_set_read(&s->io);
                io_start_tls(&s->io, ssl);
 

diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index 42e7b88..6ef7ca9 100644 (file)
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: smtpd.h,v 1.455 2014/04/19 16:55:15 gilles Exp $      */
+/*     $OpenBSD: smtpd.h,v 1.456 2014/04/29 12:18:27 reyk Exp $        */
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -1321,7 +1321,7 @@ const char *imsg_to_str(int);
 
 /* ssl_smtpd.c */
 void   *ssl_mta_init(char *, off_t, char *, off_t);
-void   *ssl_smtp_init(void *, char *, off_t, char *, off_t, void *, void *);
+void   *ssl_smtp_init(void *, void *, void *);
 
 
 /* stat_backend.c */

diff --git a/usr.sbin/smtpd/ssl_smtpd.c b/usr.sbin/smtpd/ssl_smtpd.c
index bf0c9d2..49326b3 100644 (file)
--- a/usr.sbin/smtpd/ssl_smtpd.c
+++ b/usr.sbin/smtpd/ssl_smtpd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ssl_smtpd.c,v 1.5 2014/04/29 10:08:55 reyk Exp $      */
+/*     $OpenBSD: ssl_smtpd.c,v 1.6 2014/04/29 12:18:27 reyk Exp $      */
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -81,7 +81,7 @@ dummy_verify(int ok, X509_STORE_CTX *store)
 }
 
 void *
-ssl_smtp_init(void *ssl_ctx, char *cert, off_t cert_len, char *key, off_t key_len, void *sni, void *arg)
+ssl_smtp_init(void *ssl_ctx, void *sni, void *arg)
 {
        SSL     *ssl = NULL;
        int     (*cb)(SSL *,int *,void *) = sni;