|
Lines 1-6
Link Here
|
| 1 |
diff -ruN cf.orig/feature/ckuser_cyrus.m4 cf/feature/ckuser_cyrus.m4 |
1 |
--- cf/feature/ckuser_cyrus.m4.orig 2021-03-23 05:32:02 UTC |
| 2 |
--- cf.orig/feature/ckuser_cyrus.m4 Thu Jan 1 07:00:00 1970 |
2 |
+++ cf/feature/ckuser_cyrus.m4 |
| 3 |
+++ cf/feature/ckuser_cyrus.m4 Wed Sep 22 19:53:53 2004 |
|
|
| 4 |
@@ -0,0 +1,34 @@ |
3 |
@@ -0,0 +1,34 @@ |
| 5 |
+divert(-1) |
4 |
+divert(-1) |
| 6 |
+# Written by Mike Boev <mike@tric.ru>, 2004. |
5 |
+# Written by Mike Boev <mike@tric.ru>, 2004. |
|
Lines 15-21
Link Here
|
| 15 |
+VERSIONID(`Id: ckuser_cyrus.m4,v 1.4 2004/09/21 19:02:17 m Exp ') |
14 |
+VERSIONID(`Id: ckuser_cyrus.m4,v 1.4 2004/09/21 19:02:17 m Exp ') |
| 16 |
+divert(-1) |
15 |
+divert(-1) |
| 17 |
+define(`CYRUS_SMMAPD_SOCKET', |
16 |
+define(`CYRUS_SMMAPD_SOCKET', |
| 18 |
+ ifelse(len(X`'_ARG_), `1', `local:/var/imap/socket/smmapd', _ARG_)) |
17 |
+ ifelse(len(X`'_ARG_), `1', `local:/var/imap/socket/smmap', _ARG_)) |
| 19 |
+ |
18 |
+ |
| 20 |
+MODIFY_MAILER_FLAGS(`CYRUSV2',`+5') |
19 |
+MODIFY_MAILER_FLAGS(`CYRUSV2',`+5') |
| 21 |
+ |
20 |
+ |
|
Lines 36-76
Link Here
|
| 36 |
+R<!> $* $| $* <TMPF> $# error $@ 4.3.0 $: "451 TEMPFAIL." |
35 |
+R<!> $* $| $* <TMPF> $# error $@ 4.3.0 $: "451 TEMPFAIL." |
| 37 |
+#Mailbox doesn't exist or its ACL forbids posting |
36 |
+#Mailbox doesn't exist or its ACL forbids posting |
| 38 |
+R<!> $* $| $* $# error $@ 5.1.1 $: "550 Mailbox is not available." |
37 |
+R<!> $* $| $* $# error $@ 5.1.1 $: "550 Mailbox is not available." |
| 39 |
diff -ruN cf.orig/feature/mrs.m4 cf/feature/mrs.m4 |
38 |
--- cf/feature/mrs_cyrus.m4.orig 2021-03-23 05:32:02 UTC |
| 40 |
--- cf.orig/feature/mrs.m4 Thu Jan 1 07:00:00 1970 |
39 |
+++ cf/feature/mrs_cyrus.m4 |
| 41 |
+++ cf/feature/mrs.m4 Wed Sep 22 19:54:56 2004 |
40 |
@@ -0,0 +1,80 @@ |
| 42 |
@@ -0,0 +1,25 @@ |
|
|
| 43 |
+divert(-1) |
41 |
+divert(-1) |
| 44 |
+dnl |
42 |
+dnl |
| 45 |
+dnl Updates: http://anfi.webhop.net/sendmail/mrs.html |
|
|
| 46 |
+dnl |
| 47 |
+dnl By using this file, you agree to the terms and conditions set |
| 48 |
+dnl forth in the LICENSE file which can be found at the top level of |
| 49 |
+dnl the sendmail distribution (sendmail-8.12). |
| 50 |
+dnl |
| 51 |
+dnl Contributed by Andrzej Filip |
| 52 |
+dnl |
| 53 |
+dnl THE FEATURE REQUIRES PATCHING cf/m4/proto.m4 |
| 54 |
+dnl SEE THE LINK AFTER "Updates:" |
| 55 |
+dnl |
| 56 |
+dnl Log: mrs.m4,v |
| 57 |
+dnl Revision 8.3 2004/03/18 21:39:22 anfi |
| 58 |
+dnl Changed comments prefixes to dnl to avoid m4 expansions |
| 59 |
+dnl |
| 60 |
+dnl Revision 8.2 2004/03/15 09:14:28 anfi |
| 61 |
+dnl Added "Updates:" web link. |
| 62 |
+dnl |
| 63 |
+divert(0) |
| 64 |
+VERSIONID(`Id: mrs.m4,v 8.3 2004/03/18 21:39:22 anfi Exp ') |
| 65 |
+divert(-1) |
| 66 |
+ |
| 67 |
+define(`_MRS_RELAY_', `') |
| 68 |
diff -ruN cf.orig/feature/mrs_cyrus.m4 cf/feature/mrs_cyrus.m4 |
| 69 |
--- cf.orig/feature/mrs_cyrus.m4 Thu Jan 1 07:00:00 1970 |
| 70 |
+++ cf/feature/mrs_cyrus.m4 Wed Sep 22 19:55:05 2004 |
| 71 |
@@ -0,0 +1,77 @@ |
| 72 |
+divert(-1) |
| 73 |
+dnl |
| 74 |
+dnl Updates: http://anfi.homeunix.net/sendmail/rtcyrus2.html |
43 |
+dnl Updates: http://anfi.homeunix.net/sendmail/rtcyrus2.html |
| 75 |
+dnl |
44 |
+dnl |
| 76 |
+dnl By using this file, you agree to the terms and conditions set |
45 |
+dnl By using this file, you agree to the terms and conditions set |
|
Lines 80-85
Link Here
|
| 80 |
+dnl Contributed by Andrzej Filip |
49 |
+dnl Contributed by Andrzej Filip |
| 81 |
+dnl |
50 |
+dnl |
| 82 |
+dnl Log: mrs_cyrus.m4,v |
51 |
+dnl Log: mrs_cyrus.m4,v |
|
|
52 |
+dnl Revision 8.9 2005/01/24 19:44:53 anfi |
| 53 |
+dnl Fixed handling of empty relay |
| 54 |
+dnl |
| 83 |
+dnl Revision 8.8 2004/08/11 18:20:05 anfi |
55 |
+dnl Revision 8.8 2004/08/11 18:20:05 anfi |
| 84 |
+dnl "stipdom" replaced by "dummy" |
56 |
+dnl "stipdom" replaced by "dummy" |
| 85 |
+dnl |
57 |
+dnl |
|
Lines 99-108
Link Here
|
| 99 |
+define(`_MRS_CYRUS_',`') |
71 |
+define(`_MRS_CYRUS_',`') |
| 100 |
+ |
72 |
+ |
| 101 |
+divert(0) |
73 |
+divert(0) |
| 102 |
+VERSIONID(`Id: mrs_cyrus.m4,v 8.8 2004/08/11 18:20:05 anfi Exp ') |
74 |
+VERSIONID(`Id: mrs_cyrus.m4,v 8.9 2005/01/24 19:44:53 anfi Exp ') |
| 103 |
+divert(-1) |
75 |
+divert(-1) |
| 104 |
+define(`CYRUS_SMMAPD_SOCKET', |
76 |
+define(`CYRUS_SMMAPD_SOCKET', |
| 105 |
+ ifelse(len(X`'_ARG_), `1', `/var/imap/socket/smmapd', _ARG_)) |
77 |
+ ifelse(len(X`'_ARG_), `1', `/var/imap/socket/smmap', _ARG_)) |
| 106 |
+define(`CYRUS_SMMAPD_SOCKET_TYPE', |
78 |
+define(`CYRUS_SMMAPD_SOCKET_TYPE', |
| 107 |
+ ifelse(len(X`'_ARG2_), `1', `local', _ARG2_)) |
79 |
+ ifelse(len(X`'_ARG2_), `1', `local', _ARG2_)) |
| 108 |
+LOCAL_CONFIG |
80 |
+LOCAL_CONFIG |
|
Lines 123-131
Link Here
|
| 123 |
+R<$*> $+ <@$*> $| $* <OK> $# cyrusv2 $@ dummy $: $4 |
95 |
+R<$*> $+ <@$*> $| $* <OK> $# cyrusv2 $@ dummy $: $4 |
| 124 |
+R<$*> $+ <@$*> $| $* $: <$1> $2 <@$3> |
96 |
+R<$*> $+ <@$*> $| $* $: <$1> $2 <@$3> |
| 125 |
+R<dummy> $+ <@dummy> $@ $1 |
97 |
+R<dummy> $+ <@dummy> $@ $1 |
|
|
98 |
+R< > $* $# error $@ 5.1.1 $: "550 User unknown" |
| 126 |
+R< $~[ : $* > $* $>MailerToTriple < $1 : $2 > $3 |
99 |
+R< $~[ : $* > $* $>MailerToTriple < $1 : $2 > $3 |
| 127 |
+R< $+ > $* $>MailerToTriple < $1 > $2 |
100 |
+R< $+ > $* $>MailerToTriple < $1 > $2 |
| 128 |
+R< > $* $# error $@ 5.1.1 $: "550 User unknown" |
|
|
| 129 |
+ |
101 |
+ |
| 130 |
+Smrs_cyrus_mailertable |
102 |
+Smrs_cyrus_mailertable |
| 131 |
+R<$*> $+ <@$+.> $: <$1> $2 <@ $3 > |
103 |
+R<$*> $+ <@$+.> $: <$1> $2 <@ $3 > |
|
Lines 133-141
Link Here
|
| 133 |
+R<$*> $+ <@$+> $| $* <TMPF> $# error $@ 4.3.0 $: "451 Temporary system failure. Please try again later." |
105 |
+R<$*> $+ <@$+> $| $* <TMPF> $# error $@ 4.3.0 $: "451 Temporary system failure. Please try again later." |
| 134 |
+R<$*> $+ <@$+> $| $* <OK> $# cyrusv2d $@ dummy $: $2 <@$3> |
106 |
+R<$*> $+ <@$+> $| $* <OK> $# cyrusv2d $@ dummy $: $2 <@$3> |
| 135 |
+R<$*> $+ <@$*> $| $* $: <$1> $2 <@$3> |
107 |
+R<$*> $+ <@$*> $| $* $: <$1> $2 <@$3> |
|
|
108 |
+R< > $* $# error $@ 5.1.1 $: "550 User unknown" |
| 136 |
+R< $~[ : $* > $* $>MailerToTriple < $1 : $2 > $3 |
109 |
+R< $~[ : $* > $* $>MailerToTriple < $1 : $2 > $3 |
| 137 |
+R< $+ > $* $>MailerToTriple < $1 > $2 |
110 |
+R< $+ > $* $>MailerToTriple < $1 > $2 |
| 138 |
+R< > $* $# error $@ 5.1.1 $: "550 User unknown" |
|
|
| 139 |
+ |
111 |
+ |
| 140 |
+Smrs_cyrus_stickyhub |
112 |
+Smrs_cyrus_stickyhub |
| 141 |
+R<dummy> $+ <@$+.> $: <dummy> $1 <@ $2 > |
113 |
+R<dummy> $+ <@$+.> $: <dummy> $1 <@ $2 > |
|
Lines 146-155
Link Here
|
| 146 |
+R<dummy> $+ <@$={VirtCyrus}> $| $* $# error $@ 5.1.1 $: "550 User unknown" |
118 |
+R<dummy> $+ <@$={VirtCyrus}> $| $* $# error $@ 5.1.1 $: "550 User unknown" |
| 147 |
+R<dummy> $=L <@$*> $# ifdef(`confLOCAL_MAILER',confLOCAL_MAILER,`local') $: @$1 |
119 |
+R<dummy> $=L <@$*> $# ifdef(`confLOCAL_MAILER',confLOCAL_MAILER,`local') $: @$1 |
| 148 |
+R<dummy> $* <@$*> $# ifdef(`confLOCAL_MAILER',confLOCAL_MAILER,`local') $: $1 |
120 |
+R<dummy> $* <@$*> $# ifdef(`confLOCAL_MAILER',confLOCAL_MAILER,`local') $: $1 |
| 149 |
diff -ruN cf.orig/m4/proto.m4 cf/m4/proto.m4 |
121 |
--- cf/feature/mrs.m4.orig 2021-03-23 05:32:02 UTC |
| 150 |
--- cf.orig/m4/proto.m4 Wed Sep 22 20:15:04 2004 |
122 |
+++ cf/feature/mrs.m4 |
| 151 |
+++ cf/m4/proto.m4 Wed Sep 22 19:52:41 2004 |
123 |
@@ -0,0 +1,25 @@ |
| 152 |
@@ -1315,6 +1315,9 @@ |
124 |
+divert(-1) |
|
|
125 |
+dnl |
| 126 |
+dnl Updates: http://anfi.webhop.net/sendmail/mrs.html |
| 127 |
+dnl |
| 128 |
+dnl By using this file, you agree to the terms and conditions set |
| 129 |
+dnl forth in the LICENSE file which can be found at the top level of |
| 130 |
+dnl the sendmail distribution (sendmail-8.12). |
| 131 |
+dnl |
| 132 |
+dnl Contributed by Andrzej Filip |
| 133 |
+dnl |
| 134 |
+dnl THE FEATURE REQUIRES PATCHING cf/m4/proto.m4 |
| 135 |
+dnl SEE THE LINK AFTER "Updates:" |
| 136 |
+dnl |
| 137 |
+dnl Log: mrs.m4,v |
| 138 |
+dnl Revision 8.3 2004/03/18 21:39:22 anfi |
| 139 |
+dnl Changed comments prefixes to dnl to avoid m4 expansions |
| 140 |
+dnl |
| 141 |
+dnl Revision 8.2 2004/03/15 09:14:28 anfi |
| 142 |
+dnl Added "Updates:" web link. |
| 143 |
+dnl |
| 144 |
+divert(0) |
| 145 |
+VERSIONID(`Id: mrs.m4,v 8.3 2004/03/18 21:39:22 anfi Exp ') |
| 146 |
+divert(-1) |
| 147 |
+ |
| 148 |
+define(`_MRS_RELAY_', `') |
| 149 |
--- cf/m4/proto.m4.orig 2020-07-02 16:45:12 UTC |
| 150 |
+++ cf/m4/proto.m4 |
| 151 |
@@ -1373,6 +1373,9 @@ R< error : $-.$-.$- : $+ > $* $#error $@ $1.$2.$3 $: |
| 153 |
R< error : $- : $+ > $* $#error $@ $(dequote $1 $) $: $2 |
152 |
R< error : $- : $+ > $* $#error $@ $(dequote $1 $) $: $2 |
| 154 |
R< error : $+ > $* $#error $: $1 |
153 |
R< error : $+ > $* $#error $: $1 |
| 155 |
R< local : $* > $* $>CanonLocal < $1 > $2 |
154 |
R< local : $* > $* $>CanonLocal < $1 > $2 |
|
Lines 159-161
Link Here
|
| 159 |
dnl it is $~[ instead of $- to avoid matches on IPv6 addresses |
158 |
dnl it is $~[ instead of $- to avoid matches on IPv6 addresses |
| 160 |
R< $~[ : $+ @ $+ > $*<$*>$* $# $1 $@ $3 $: $2<@$3> use literal user |
159 |
R< $~[ : $+ @ $+ > $*<$*>$* $# $1 $@ $3 $: $2<@$3> use literal user |
| 161 |
R< $~[ : $+ > $* $# $1 $@ $2 $: $3 try qualified mailer |
160 |
R< $~[ : $+ > $* $# $1 $@ $2 $: $3 try qualified mailer |
|
|
161 |
--- cf/mailer/cyrusv2.m4.orig 2020-05-19 19:54:31 UTC |
| 162 |
+++ cf/mailer/cyrusv2.m4 |
| 163 |
@@ -1,18 +1,30 @@ |
| 164 |
PUSHDIVERT(-1) |
| 165 |
-# |
| 166 |
-# Copyright (c) 2002 Proofpoint, Inc. and its suppliers. |
| 167 |
-# All rights reserved. |
| 168 |
-# |
| 169 |
-# By using this file, you agree to the terms and conditions set |
| 170 |
-# forth in the LICENSE file which can be found at the top level of |
| 171 |
-# the sendmail distribution. |
| 172 |
-# |
| 173 |
-# Contributed by Kenneth Murchison. |
| 174 |
-# |
| 175 |
+dnl |
| 176 |
+dnl Updates: http://anfi.webhop.org/sendmail/cyrusv2.html |
| 177 |
+dnl |
| 178 |
+dnl By using this file, you agree to the terms and conditions set |
| 179 |
+dnl forth in the LICENSE file which can be found at the top level of |
| 180 |
+dnl the sendmail distribution (sendmail-8.12). |
| 181 |
+dnl |
| 182 |
+dnl Original version contributed by Kenneth Murchison. |
| 183 |
+dnl Version with cyrusv2d mailer added contributed by Andrzej Filip |
| 184 |
+dnl |
| 185 |
+dnl $Log: cyrusv2.m4,v $ |
| 186 |
+dnl Revision 8.3 2004/03/18 21:38:27 anfi |
| 187 |
+dnl Changed comments prefixes to dnl to avoid m4 expansions |
| 188 |
+dnl |
| 189 |
+dnl Revision 8.2 2004/03/15 09:14:28 anfi |
| 190 |
+dnl Added "Updates:" web link. |
| 191 |
+dnl |
| 192 |
|
| 193 |
-_DEFIFNOT(`_DEF_CYRUSV2_MAILER_FLAGS', `lsDFMnqXz') |
| 194 |
-_DEFIFNOT(`CYRUSV2_MAILER_FLAGS', `A@/:|m') |
| 195 |
-ifdef(`CYRUSV2_MAILER_ARGS',, `define(`CYRUSV2_MAILER_ARGS', `FILE /var/imap/socket/lmtp')') |
| 196 |
+_DEFIFNOT(`CYRUS_LMTP_SOCKET',`/var/imap/socket/lmtp') |
| 197 |
+_DEFIFNOT(`_DEF_CYRUSV2_MAILER_FLAGS', `lsDFMnqXz1') |
| 198 |
+_DEFIFNOT(`_DEF_CYRUSV2D_MAILER_FLAGS', _DEF_CYRUSV2_MAILER_FLAGS) |
| 199 |
+_DEFIFNOT(`CYRUSV2_MAILER_FLAGS', `mA@/:|') |
| 200 |
+_DEFIFNOT(`CYRUSV2D_MAILER_FLAGS', `m') |
| 201 |
+dnl |
| 202 |
+ifdef(`CYRUSV2_MAILER_ARGS',, `define(`CYRUSV2_MAILER_ARGS', `FILE 'CYRUS_LMTP_SOCKET)') |
| 203 |
+ifdef(`CYRUSV2D_MAILER_ARGS',, `define(`CYRUSV2D_MAILER_ARGS', _CYRUS_V2_MAILER_ARGS)') |
| 204 |
define(`_CYRUSV2_QGRP', `ifelse(defn(`CYRUSV2_MAILER_QGRP'),`',`', ` Q=CYRUSV2_MAILER_QGRP,')')dnl |
| 205 |
|
| 206 |
POPDIVERT |
| 207 |
@@ -21,9 +33,13 @@ POPDIVERT |
| 208 |
### Cyrus V2 Mailer specification ### |
| 209 |
######################################### |
| 210 |
|
| 211 |
-VERSIONID(`$Id: cyrusv2.m4,v 1.2 2013-11-22 20:51:14 ca Exp $') |
| 212 |
+VERSIONID(`$Id: cyrusv2.m4,v 8.3 2004/03/18 21:38:27 anfi Exp $') |
| 213 |
|
| 214 |
Mcyrusv2, P=[IPC], F=_MODMF_(CONCAT(_DEF_CYRUSV2_MAILER_FLAGS, CYRUSV2_MAILER_FLAGS), `CYRUSV2'), |
| 215 |
S=EnvFromSMTP/HdrFromL, R=EnvToL/HdrToL, E=\r\n, |
| 216 |
+ _OPTINS(`CYRUSV2_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`CYRUSV2_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`CYRUSV2_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,_CYRUSV2_QGRP |
| 217 |
+ A=CYRUSV2_MAILER_ARGS |
| 218 |
+Mcyrusv2d, P=[IPC], F=_MODMF_(CONCAT(_DEF_CYRUSV2D_MAILER_FLAGS, CYRUSV2D_MAILER_FLAGS), `CYRUSV2D'), |
| 219 |
+ S=EnvFromSMTP/HdrFromL, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), E=\r\n, |
| 220 |
_OPTINS(`CYRUSV2_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`CYRUSV2_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`CYRUSV2_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,_CYRUSV2_QGRP |
| 221 |
A=CYRUSV2_MAILER_ARGS |