diff options
| author | erdgeist <erdgeist@bauklotz.local> | 2015-08-16 16:38:25 +0200 |
|---|---|---|
| committer | erdgeist <erdgeist@bauklotz.local> | 2015-08-16 16:38:25 +0200 |
| commit | 23f0e1561767dd8a396188e317bae5920d171ea8 (patch) | |
| tree | a67f44e39ad8a45e42d60634488a65c37f3ad432 /files/arts/software/Code/elektropost/auth.patch.diff-tls | |
Initial import of my nikola website
Diffstat (limited to 'files/arts/software/Code/elektropost/auth.patch.diff-tls')
| -rw-r--r-- | files/arts/software/Code/elektropost/auth.patch.diff-tls | 141 |
1 files changed, 141 insertions, 0 deletions
diff --git a/files/arts/software/Code/elektropost/auth.patch.diff-tls b/files/arts/software/Code/elektropost/auth.patch.diff-tls new file mode 100644 index 0000000..2960def --- /dev/null +++ b/files/arts/software/Code/elektropost/auth.patch.diff-tls | |||
| @@ -0,0 +1,141 @@ | |||
| 1 | *** auth.patch.orig Fri May 10 07:41:20 2002 | ||
| 2 | --- auth.patch Thu Jan 9 15:22:06 2014 | ||
| 3 | *************** | ||
| 4 | *** 14,42 **** | ||
| 5 | binm1.sh conf-qmail | ||
| 6 | cat binm1.sh \ | ||
| 7 | *************** | ||
| 8 | ! *** 1536,1547 **** | ||
| 9 | timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \ | ||
| 10 | date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \ | ||
| 11 | open.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a str.a \ | ||
| 12 | ! fs.a auto_qmail.o socket.lib | ||
| 13 | ./load qmail-smtpd rcpthosts.o commands.o timeoutread.o \ | ||
| 14 | timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \ | ||
| 15 | received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \ | ||
| 16 | datetime.a getln.a open.a sig.a case.a env.a stralloc.a \ | ||
| 17 | ! alloc.a substdio.a error.a str.a fs.a auto_qmail.o `cat \ | ||
| 18 | socket.lib` | ||
| 19 | |||
| 20 | qmail-smtpd.0: \ | ||
| 21 | ! --- 1540,1551 ---- | ||
| 22 | timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \ | ||
| 23 | date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \ | ||
| 24 | open.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a str.a \ | ||
| 25 | ! fs.a auto_qmail.o base64.o socket.lib | ||
| 26 | ./load qmail-smtpd rcpthosts.o commands.o timeoutread.o \ | ||
| 27 | timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \ | ||
| 28 | received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \ | ||
| 29 | datetime.a getln.a open.a sig.a case.a env.a stralloc.a \ | ||
| 30 | ! ! alloc.a substdio.a error.a str.a fs.a auto_qmail.o base64.o `cat \ | ||
| 31 | socket.lib` | ||
| 32 | |||
| 33 | qmail-smtpd.0: \ | ||
| 34 | --- 14,44 ---- | ||
| 35 | binm1.sh conf-qmail | ||
| 36 | cat binm1.sh \ | ||
| 37 | *************** | ||
| 38 | ! *** 1537,1549 **** | ||
| 39 | timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \ | ||
| 40 | date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \ | ||
| 41 | open.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a str.a \ | ||
| 42 | ! fs.a auto_qmail.o socket.lib | ||
| 43 | ./load qmail-smtpd rcpthosts.o commands.o timeoutread.o \ | ||
| 44 | timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \ | ||
| 45 | + tls.o ssl_timeoutio.o ndelay.a -L/usr/local/ssl/lib -lssl -lcrypto \ | ||
| 46 | received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \ | ||
| 47 | datetime.a getln.a open.a sig.a case.a env.a stralloc.a \ | ||
| 48 | ! alloc.a substdio.a error.a str.a fs.a auto_qmail.o `cat \ | ||
| 49 | socket.lib` | ||
| 50 | |||
| 51 | qmail-smtpd.0: \ | ||
| 52 | ! --- 1541,1553 ---- | ||
| 53 | timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \ | ||
| 54 | date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \ | ||
| 55 | open.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a str.a \ | ||
| 56 | ! fs.a auto_qmail.o base64.o socket.lib | ||
| 57 | ./load qmail-smtpd rcpthosts.o commands.o timeoutread.o \ | ||
| 58 | timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \ | ||
| 59 | + tls.o ssl_timeoutio.o ndelay.a -L/usr/local/ssl/lib -lssl -lcrypto \ | ||
| 60 | received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \ | ||
| 61 | datetime.a getln.a open.a sig.a case.a env.a stralloc.a \ | ||
| 62 | ! ! alloc.a substdio.a error.a str.a fs.a auto_qmail.o base64.o `cat \ | ||
| 63 | socket.lib` | ||
| 64 | |||
| 65 | qmail-smtpd.0: \ | ||
| 66 | *************** | ||
| 67 | *** 174,203 **** | ||
| 68 | stralloc greeting = {0}; | ||
| 69 | |||
| 70 | *************** | ||
| 71 | ! *** 229,235 **** | ||
| 72 | ! } | ||
| 73 | void smtp_ehlo(arg) char *arg; | ||
| 74 | { | ||
| 75 | ! ! smtp_greet("250-"); out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n"); | ||
| 76 | seenmail = 0; dohelo(arg); | ||
| 77 | ! } | ||
| 78 | ! void smtp_rset() | ||
| 79 | ! --- 241,255 ---- | ||
| 80 | ! } | ||
| 81 | void smtp_ehlo(arg) char *arg; | ||
| 82 | { | ||
| 83 | ! ! smtp_greet("250-"); | ||
| 84 | ! ! #ifdef AUTHCRAM | ||
| 85 | ! out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN"); | ||
| 86 | ! out("\r\n250-AUTH=LOGIN CRAM-MD5 PLAIN"); | ||
| 87 | ! #else | ||
| 88 | ! out("\r\n250-AUTH LOGIN PLAIN"); | ||
| 89 | ! out("\r\n250-AUTH=LOGIN PLAIN"); | ||
| 90 | ! #endif | ||
| 91 | ! ! out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n"); | ||
| 92 | seenmail = 0; dohelo(arg); | ||
| 93 | - } | ||
| 94 | - void smtp_rset() | ||
| 95 | *************** | ||
| 96 | *** 394,403 **** | ||
| 97 | --- 414,639 ---- | ||
| 98 | --- 176,218 ---- | ||
| 99 | stralloc greeting = {0}; | ||
| 100 | |||
| 101 | *************** | ||
| 102 | ! *** 265,273 **** | ||
| 103 | void smtp_ehlo(arg) char *arg; | ||
| 104 | { | ||
| 105 | ! smtp_greet("250-"); | ||
| 106 | ! #ifdef TLS | ||
| 107 | ! ! if (!ssl && (stat("control/servercert.pem",&st) == 0)) | ||
| 108 | ! ! out("\r\n250-STARTTLS"); | ||
| 109 | ! #endif | ||
| 110 | ! out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n"); | ||
| 111 | seenmail = 0; dohelo(arg); | ||
| 112 | ! --- 277,302 ---- | ||
| 113 | void smtp_ehlo(arg) char *arg; | ||
| 114 | { | ||
| 115 | ! smtp_greet("250-"); | ||
| 116 | ! + #ifdef AUTHCRAM | ||
| 117 | ! #ifdef TLS | ||
| 118 | ! ! out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN"); | ||
| 119 | ! ! out("\r\n250-AUTH=LOGIN CRAM-MD5 PLAIN"); | ||
| 120 | ! ! if (!ssl && (stat("control/servercert.pem",&st) == 0)) | ||
| 121 | ! ! out("\r\n250-STARTTLS"); | ||
| 122 | ! ! #else | ||
| 123 | ! out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN"); | ||
| 124 | ! out("\r\n250-AUTH=LOGIN CRAM-MD5 PLAIN"); | ||
| 125 | + ! #endif | ||
| 126 | + ! #else | ||
| 127 | + ! #ifdef TLS | ||
| 128 | + ! out("\r\n250-AUTH LOGIN PLAIN"); | ||
| 129 | + ! out("\r\n250-AUTH=LOGIN PLAIN"); | ||
| 130 | + ! if (!ssl && (stat("control/servercert.pem",&st) == 0)) | ||
| 131 | + ! out("\r\n250-STARTTLS"); | ||
| 132 | ! #else | ||
| 133 | ! out("\r\n250-AUTH LOGIN PLAIN"); | ||
| 134 | ! out("\r\n250-AUTH=LOGIN PLAIN"); | ||
| 135 | ! #endif | ||
| 136 | ! #endif | ||
| 137 | ! out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n"); | ||
| 138 | seenmail = 0; dohelo(arg); | ||
| 139 | *************** | ||
| 140 | *** 394,403 **** | ||
| 141 | --- 414,639 ---- | ||
