diff options
author | Jan Rękorajski | 2000-08-31 23:06:03 (GMT) |
---|---|---|
committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
commit | 10a66f6d565cbf139e3aace57b34184aca267187 (patch) | |
tree | cf9f3e561d67cbc3a2a3551ceb57fd4c39a2c7ae | |
parent | cd09924a7aba4a2fce6bff4913ccc4d16550b41e (diff) | |
download | qmail-qmail-1_03-26.zip qmail-qmail-1_03-26.tar.gz |
- give IPv4, not IPv6 as replyqmail-1_03-26
Changed files:
qmail-rblsmtpd-rss.patch -> 1.2
-rw-r--r-- | qmail-rblsmtpd-rss.patch | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/qmail-rblsmtpd-rss.patch b/qmail-rblsmtpd-rss.patch index 0886beb..94f6122 100644 --- a/qmail-rblsmtpd-rss.patch +++ b/qmail-rblsmtpd-rss.patch @@ -1,6 +1,6 @@ -diff -urN qmail-1.03.orig/rblsmtpd-0.70/INSTALL qmail-1.03/rblsmtpd-0.70/INSTALL ---- qmail-1.03.orig/rblsmtpd-0.70/INSTALL Tue Aug 25 17:58:22 1998 -+++ qmail-1.03/rblsmtpd-0.70/INSTALL Thu Aug 31 21:43:58 2000 +diff -urN qmail-1.03/rblsmtpd-0.70/INSTALL qmail-1.03.rss/rblsmtpd-0.70/INSTALL +--- qmail-1.03/rblsmtpd-0.70/INSTALL Tue Aug 25 17:58:22 1998 ++++ qmail-1.03.rss/rblsmtpd-0.70/INSTALL Thu Aug 31 23:57:30 2000 @@ -71,20 +71,49 @@ quit 221 rblsmtpd.local @@ -54,9 +54,9 @@ diff -urN qmail-1.03.orig/rblsmtpd-0.70/INSTALL qmail-1.03/rblsmtpd-0.70/INSTALL That's it! To report success: -diff -urN qmail-1.03.orig/rblsmtpd-0.70/rblsmtpd.8 qmail-1.03/rblsmtpd-0.70/rblsmtpd.8 ---- qmail-1.03.orig/rblsmtpd-0.70/rblsmtpd.8 Thu Aug 31 21:43:45 2000 -+++ qmail-1.03/rblsmtpd-0.70/rblsmtpd.8 Thu Aug 31 21:43:58 2000 +diff -urN qmail-1.03/rblsmtpd-0.70/rblsmtpd.8 qmail-1.03.rss/rblsmtpd-0.70/rblsmtpd.8 +--- qmail-1.03/rblsmtpd-0.70/rblsmtpd.8 Fri Sep 1 00:21:44 2000 ++++ qmail-1.03.rss/rblsmtpd-0.70/rblsmtpd.8 Thu Aug 31 23:57:30 2000 @@ -11,6 +11,9 @@ .B \-R ] [ @@ -89,9 +89,9 @@ diff -urN qmail-1.03.orig/rblsmtpd-0.70/rblsmtpd.8 qmail-1.03/rblsmtpd-0.70/rbls .SH "TEMPORARY ERRORS" Normally .B rblsmtpd -diff -urN qmail-1.03.orig/rblsmtpd-0.70/rblsmtpd.c qmail-1.03/rblsmtpd-0.70/rblsmtpd.c ---- qmail-1.03.orig/rblsmtpd-0.70/rblsmtpd.c Thu Aug 31 21:43:45 2000 -+++ qmail-1.03/rblsmtpd-0.70/rblsmtpd.c Thu Aug 31 21:44:45 2000 +diff -urN qmail-1.03/rblsmtpd-0.70/rblsmtpd.c qmail-1.03.rss/rblsmtpd-0.70/rblsmtpd.c +--- qmail-1.03/rblsmtpd-0.70/rblsmtpd.c Fri Sep 1 00:21:44 2000 ++++ qmail-1.03.rss/rblsmtpd-0.70/rblsmtpd.c Thu Aug 31 23:57:30 2000 @@ -108,7 +108,7 @@ void usage() @@ -101,9 +101,9 @@ diff -urN qmail-1.03.orig/rblsmtpd-0.70/rblsmtpd.c qmail-1.03/rblsmtpd-0.70/rbls } void main(argc,argv) -diff -urN qmail-1.03.orig/rblsmtpd-0.70/txt.c qmail-1.03/rblsmtpd-0.70/txt.c ---- qmail-1.03.orig/rblsmtpd-0.70/txt.c Thu Aug 31 21:43:45 2000 -+++ qmail-1.03/rblsmtpd-0.70/txt.c Thu Aug 31 21:45:31 2000 +diff -urN qmail-1.03/rblsmtpd-0.70/txt.c qmail-1.03.rss/rblsmtpd-0.70/txt.c +--- qmail-1.03/rblsmtpd-0.70/txt.c Fri Sep 1 00:21:44 2000 ++++ qmail-1.03.rss/rblsmtpd-0.70/txt.c Fri Sep 1 00:21:18 2000 @@ -14,6 +14,7 @@ #include "str.h" #include "fmt.h" @@ -112,7 +112,7 @@ diff -urN qmail-1.03.orig/rblsmtpd-0.70/txt.c qmail-1.03/rblsmtpd-0.70/txt.c static unsigned short getshort(c) unsigned char *c; { unsigned short u; u = c[0]; return (u << 8) + c[1]; } -@@ -32,8 +33,18 @@ +@@ -32,8 +33,19 @@ int len; unsigned char *pos; unsigned char *end; @@ -120,6 +120,7 @@ diff -urN qmail-1.03.orig/rblsmtpd-0.70/txt.c qmail-1.03/rblsmtpd-0.70/txt.c + int wanttype=T_TXT; + int mindatalen=1; struct ip_address *ip = &ix->addr.ip; ++ stralloc sat = {0}; + i = str_chr(base, ':'); + if (base[i]) { @@ -131,7 +132,7 @@ diff -urN qmail-1.03.orig/rblsmtpd-0.70/txt.c qmail-1.03/rblsmtpd-0.70/txt.c if (!stralloc_ready(sa,100 + str_len(base))) return -1; x = sa->s; x += fmt_ulong(x,(unsigned long) ip->d[3]); *x++ = '.'; -@@ -44,7 +55,7 @@ +@@ -44,7 +56,7 @@ *x = 0; errno = 0; @@ -140,7 +141,7 @@ diff -urN qmail-1.03.orig/rblsmtpd-0.70/txt.c qmail-1.03/rblsmtpd-0.70/txt.c if (len < sizeof(HEADER)) { if (errno == ECONNREFUSED) return -1; if (h_errno == TRY_AGAIN) return -1; -@@ -73,11 +84,32 @@ +@@ -73,11 +85,38 @@ if (i < 0) return -1; pos += i; @@ -156,16 +157,22 @@ diff -urN qmail-1.03.orig/rblsmtpd-0.70/txt.c qmail-1.03/rblsmtpd-0.70/txt.c + if (pos + 11 + i > end) return -1; + if (!stralloc_copyb(sa,pos + 11,i)) return -1; + } else { -+ if(!stralloc_copys(sa, "")) return -1; -+ while(*altreply) { ++ if (!stralloc_ready(&sat,100)) return -1; ++ if (!stralloc_copys(sa, "")) return -1; ++ while (*altreply) { + i = str_chr(altreply, '%'); -+ if(!stralloc_catb(sa, altreply, i)) return -1; -+ if(altreply[i] && ++ if (!stralloc_catb(sa, altreply, i)) return -1; ++ if (altreply[i] && + altreply[i+1]=='I' && + altreply[i+2]=='P' && + altreply[i+3]=='%') { -+ x=env_get("TCPREMOTEIP"); -+ if(!stralloc_catb(sa, x, str_len(x))) return -1; ++ x = sat.s; ++ x += fmt_ulong(x,(unsigned long) ip->d[0]); *x++ = '.'; ++ x += fmt_ulong(x,(unsigned long) ip->d[1]); *x++ = '.'; ++ x += fmt_ulong(x,(unsigned long) ip->d[2]); *x++ = '.'; ++ x += fmt_ulong(x,(unsigned long) ip->d[3]); x++; ++ *x = 0; ++ if(!stralloc_cats(sa, sat.s)) return -1; + altreply+=i+4; + } else if(altreply[i]) { + if(!stralloc_cats(sa, "%")) return -1; |