summaryrefslogtreecommitdiff
path: root/mail/qmail/files/auth.patch.patch-tls
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2006-07-28 18:21:59 +0000
committerRenato Botelho <garga@FreeBSD.org>2006-07-28 18:21:59 +0000
commit3d655dcd60fa8e010e8738d9aeb67ef9bdc4e213 (patch)
treed2cfc67baefe6887161357305fd3f949ca1dbfd0 /mail/qmail/files/auth.patch.patch-tls
parentUpdate to 3.16. (diff)
- Change spamcontrol's spf patch to log when deny an email
- Move auth patches from FILESDIR to MASTER_SITE_LOCAL
Notes
Notes: svn path=/head/; revision=168984
Diffstat (limited to 'mail/qmail/files/auth.patch.patch-tls')
-rw-r--r--mail/qmail/files/auth.patch.patch-tls90
1 files changed, 0 insertions, 90 deletions
diff --git a/mail/qmail/files/auth.patch.patch-tls b/mail/qmail/files/auth.patch.patch-tls
deleted file mode 100644
index 751b0e815e93..000000000000
--- a/mail/qmail/files/auth.patch.patch-tls
+++ /dev/null
@@ -1,90 +0,0 @@
---- auth.patch.orig Mon Dec 12 12:23:49 2005
-+++ auth.patch Mon Dec 12 12:25:57 2005
-@@ -14,29 +14,31 @@
- binm1.sh conf-qmail
- cat binm1.sh \
- ***************
--*** 1536,1547 ****
-+*** 1537,1549 ****
- timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \
- date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \
- open.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a str.a \
- ! fs.a auto_qmail.o socket.lib
- ./load qmail-smtpd rcpthosts.o commands.o timeoutread.o \
- timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \
-+ tls.o ssl_timeoutio.o ndelay.a -L/usr/local/ssl/lib -lssl -lcrypto \
- received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
- datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
- ! alloc.a substdio.a error.a str.a fs.a auto_qmail.o `cat \
- socket.lib`
-
- qmail-smtpd.0: \
----- 1540,1551 ----
-+--- 1541,1553 ----
- timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \
- date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \
- open.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a str.a \
- ! fs.a auto_qmail.o base64.o socket.lib
- ./load qmail-smtpd rcpthosts.o commands.o timeoutread.o \
- timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \
-+ tls.o ssl_timeoutio.o ndelay.a -L/usr/local/ssl/lib -lssl -lcrypto \
- received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
- datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
--! alloc.a substdio.a error.a str.a fs.a auto_qmail.o base64.o `cat \
-+! alloc.a substdio.a error.a str.a fs.a auto_qmail.o base64.o `cat \
- socket.lib`
-
- qmail-smtpd.0: \
-@@ -174,30 +176,40 @@
- stralloc greeting = {0};
-
- ***************
--*** 229,235 ****
-- }
-+*** 265,272 ****
- void smtp_ehlo(arg) char *arg;
- {
--! smtp_greet("250-"); out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n");
-+ smtp_greet("250-");
-+ #ifdef TLS
-+! if (!ssl) out("\r\n250-STARTTLS");
-+ #endif
-+ out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n");
- seenmail = 0; dohelo(arg);
-- }
-- void smtp_rset()
----- 241,255 ----
-- }
-+--- 277,300 ----
- void smtp_ehlo(arg) char *arg;
- {
--! smtp_greet("250-");
--! #ifdef AUTHCRAM
-+ smtp_greet("250-");
-++ #ifdef AUTHCRAM
-+ #ifdef TLS
-+! out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN");
-+! out("\r\n250-AUTH=LOGIN CRAM-MD5 PLAIN");
-+! if (!ssl) out("\r\n250-STARTTLS");
-+! #else
- ! out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN");
- ! out("\r\n250-AUTH=LOGIN CRAM-MD5 PLAIN");
-+! #endif
-+! #else
-+! #ifdef TLS
-+! out("\r\n250-AUTH LOGIN PLAIN");
-+! out("\r\n250-AUTH=LOGIN PLAIN");
-+! if (!ssl) out("\r\n250-STARTTLS");
- ! #else
- ! out("\r\n250-AUTH LOGIN PLAIN");
- ! out("\r\n250-AUTH=LOGIN PLAIN");
- ! #endif
--! out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n");
-+ #endif
-+ out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n");
- seenmail = 0; dohelo(arg);
-- }
-- void smtp_rset()
- ***************
- *** 394,403 ****
- --- 414,639 ----