|
Check-in Number:
|
708 | |
| Date: |
2001-Aug-20 16:11:30 (local)
2001-Aug-20 14:11:30 (UTC) |
| User: | thl |
| Branch: | |
| Comment: |
fixed GROUPMODE_ENVELOPE foo+bar@quux.com notation prefix stripping where sendmail passes us already rewritten <bar@quux.com> as argument to "RCPT To:" command |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/lmtp2nntp/00TODO 1.12 -> 1.13
--- 00TODO 2001/08/20 13:02:35 1.12
+++ 00TODO 2001/08/20 14:11:30 1.13
@@ -10,6 +10,7 @@
RFC1891 ENVID
RFC1891 6.2
FALSE, TRUE vs. == FALSE, == TRUE, != FALSE, != TRUE
+-h needs to understand multiple hosts as commaseparated list
**** LMTP REDESIGN ****
|
|
ossp-pkg/lmtp2nntp/INSTALL 1.2 -> 1.3
--- INSTALL 2001/08/20 13:22:33 1.2
+++ INSTALL 2001/08/20 14:11:30 1.3
@@ -24,9 +24,12 @@
Mlmtp2nntp, P=LMTP2NNTP_MAILER_PATH, F=LMTP2NNTP_MAILER_FLAGS,
S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n,
L=990, T=DNS/RFC822/SMTP, M=LMTP2NNTP_MAILER_MAX,
- A=lmtp2nntp -d LMTP2NNTP_MAILER_DELIVERYMODE dnl
- -h $h -g LMTP2NNTP_MAILER_GROUPMODE dnl
- LMTP2NNTP_MAILER_NEWSGROUPS
+ A=lmtp2nntp LMTP2NNTP_MAILER_ARGS dnl
+ -d LMTP2NNTP_MAILER_DELIVERYMODE dnl
+ -h $h dnl
+ -g LMTP2NNTP_MAILER_GROUPMODE dnl
+ LMTP2NNTP_MAILER_GROUPS
+
______________________________________________________________________
Add to your sendmail.m4 (or sendmail.mc) the following entry:
|
|
ossp-pkg/lmtp2nntp/lmtp2nntp.c 1.19 -> 1.20
--- lmtp2nntp.c 2001/08/20 10:33:22 1.19
+++ lmtp2nntp.c 2001/08/20 14:11:30 1.20
@@ -156,7 +156,7 @@
initsession(&ctx->session);
ctx->msg = NULL;
-#if 0
+#if 1
{
char buf[1000];
int bufused = 0;
@@ -648,7 +648,7 @@
if (ctx->option_groupmode == GROUPMODE_ENVELOPE) {
//fprintf(stderr, "DEBUG: before transform cp=***%s***\n", cp);
- if (!str_parse(cp, "m/^.+?\\+(.+)?@.+$/i", &group)) { //FIXME >=2 * @
+ if (!str_parse(cp, "m/^<(.+)?@[^@]+>$/i", &group)) {
res.statuscode = "550";
res.dsncode = "5.1.1";
res.statusmsg = "Recipient did not transform into Group.";
|
|
ossp-pkg/lmtp2nntp/test/run.sh 1.7 -> 1.8
--- run.sh 2001/08/20 10:33:22 1.7
+++ run.sh 2001/08/20 14:11:31 1.8
@@ -12,11 +12,14 @@
h="H"
z="Z"
e="E"
- if [ -e /tmp/tracing ]
- then
+ if [ -e /tmp/tracing ]; then
ssh -t -x root@localhost exec rm -f /tmp/tracing
fi
touch /tmp/tracing
+ if [ -e /tmp/testmessage ]; then
+ ssh -t -x root@localhost exec rm -f /tmp/testmessage
+ fi
+ touch /tmp/testmessage
}
post1000 ()
@@ -40,18 +43,18 @@
{
newmsg lmtp
cat /tmp/testmessage \
- | ./lmtp2nntp -t /tmp/tracing -d $1 -g $2 -h dev16 cw.de.sd.apps.dev.test
+ | ../lmtp2nntp -t /tmp/tracing -d $1 -g $2 -h dev16 cw.de.sd.apps.dev.test
cat /tmp/testmessage \
- | ./lmtp2nntp -t /tmp/tracing -d $1 -g $2 -h dev16 cw.de.sd.apps.dev.test
+ | ../lmtp2nntp -t /tmp/tracing -d $1 -g $2 -h dev16 cw.de.sd.apps.dev.test
}
sendmaildup()
{
newmsg sendmail
cat /tmp/testmessage \
- | sendmail -i posting+$h$z$e@dev12.dev.de.cw.net
+ | sendmail -i posting+cw.de.sd.apps.dev.test@dev12.dev.de.cw.net
cat /tmp/testmessage \
- | sendmail -i posting+$h$z$e@dev12.dev.de.cw.net
+ | sendmail -i posting+cw.de.sd.apps.dev.test@dev12.dev.de.cw.net
}
newmsg()
@@ -88,10 +91,10 @@
#ok newmsg sendmail; ls -l /tmp/testmessage && cat /tmp/testmessage
#ok lmtp feed arg
-lmtp post arg
+# lmtp post arg
#ok lmtp feed envelope
#ok lmtp post envelope
-#sendmaildup
+sendmaildup
#post1000
after
|
|
