diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2019-06-24 16:45:35 +0200 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2019-06-24 16:45:35 +0200 |
| commit | 5fe40c286b4ce67f75a0f608a01691475a9f7528 (patch) | |
| tree | 507a2529affc00094b541a0de27b222c5d51bc91 | |
| parent | Merge branch 'master' into portable (diff) | |
| download | OpenSMTPD-5fe40c286b4ce67f75a0f608a01691475a9f7528.tar.xz OpenSMTPD-5fe40c286b4ce67f75a0f608a01691475a9f7528.zip | |
sync
| -rw-r--r-- | mk/smtpd/Makefile.am | 2 | ||||
| -rw-r--r-- | smtpscript/iobuf.c | 6 | ||||
| -rw-r--r-- | smtpscript/smtpscript/Makefile | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mk/smtpd/Makefile.am b/mk/smtpd/Makefile.am index 2bd2c71f..fdf77cf6 100644 --- a/mk/smtpd/Makefile.am +++ b/mk/smtpd/Makefile.am @@ -86,7 +86,7 @@ smtpd_SOURCES+= $(smtpd_srcdir)/scheduler_ramqueue.c smtpd_SOURCES+= $(smtpd_srcdir)/stat_ramstat.c -smtpd_CFLAGS= -DIO_SSL +smtpd_CFLAGS= -DIO_TLS smtpd_CFLAGS+= -DCA_FILE=\"$(CA_FILE)\" AM_CPPFLAGS= -I$(smtpd_srcdir) \ diff --git a/smtpscript/iobuf.c b/smtpscript/iobuf.c index 7dcd45b9..05a9cd59 100644 --- a/smtpscript/iobuf.c +++ b/smtpscript/iobuf.c @@ -26,7 +26,7 @@ #include <string.h> #include <unistd.h> -#ifdef IO_SSL +#ifdef IO_TLS #include <openssl/err.h> #include <openssl/ssl.h> #endif @@ -387,7 +387,7 @@ iobuf_flush(struct iobuf *io, int fd) return (0); } -#ifdef IO_SSL +#ifdef IO_TLS int iobuf_flush_ssl(struct iobuf *io, void *ssl) @@ -463,4 +463,4 @@ iobuf_read_ssl(struct iobuf *io, void *ssl) return (n); } -#endif /* IO_SSL */ +#endif /* IO_TLS */ diff --git a/smtpscript/smtpscript/Makefile b/smtpscript/smtpscript/Makefile index 3679481c..0520606f 100644 --- a/smtpscript/smtpscript/Makefile +++ b/smtpscript/smtpscript/Makefile @@ -7,6 +7,6 @@ NOMAN= noman LDADD+= -lutil -lssl -lcrypto DPADD+= ${LIBEVENT} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} CPPFLAGS+= -I${.CURDIR}/.. -CPPFLAGS+= -DIO_SSL +CPPFLAGS+= -DIO_TLS .include <bsd.prog.mk> |