- 论坛徽章:
- 0
|
朋友门请帮忙
ucspi-tcp-0.88.a_record.patch
- diff -ruN --exclude conf-* ucspi-tcp-0.88/rblsmtpd.c ucspi-tcp-0.88.fix/rblsmtpd.c
- --- ucspi-tcp-0.88/rblsmtpd.c Sat Mar 18 10:18:42 2000
- +++ ucspi-tcp-0.88.fix/rblsmtpd.c Wed Aug 9 16:42:33 2000
- @@ -60,16 +60,54 @@
-
- void rbl(char *base)
- {
- + int i;
- + char *altreply = 0;
- if (decision) return;
- if (!stralloc_copy(&tmp,&ip_reverse)) nomem();
- + i = str_chr(base, ':');
- + if (base[i]) {
- + base[i] = 0;
- + altreply = base+i+1;
- + }
- if (!stralloc_cats(&tmp,base)) nomem();
- - if (dns_txt(&text,&tmp) == -1) {
- - flagmustnotbounce = 1;
- - if (flagfailclosed) {
- - if (!stralloc_copys(&text,"temporary RBL lookup error")) nomem();
- - decision = 2;
- + if (altreply) {
- + if (dns_ip4(&text,&tmp) == -1) {
- + flagmustnotbounce = 1;
- + if (flagfailclosed) {
- + if (!stralloc_copys(&text,"temporary RBL lookup error")) nomem();
- + decision = 2;
- + }
- + return;
- + }
- + if (text.len) {
- + if(!stralloc_copys(&text, "")) nomem();
- + while(*altreply) {
- + char *x;
- + i = str_chr(altreply, '%');
- + if(!stralloc_catb(&text, altreply, i)) nomem();
- + if(altreply[i] &&
- + altreply[i+1]=='I' &&
- + altreply[i+2]=='P' &&
- + altreply[i+3]=='%') {
- + if(!stralloc_catb(&text, ip_env, str_len(ip_env))) nomem();
- + altreply+=i+4;
- + } else if(altreply[i]) {
- + if(!stralloc_cats(&text, "%")) nomem();
- + altreply+=i+1;
- + } else {
- + altreply+=i;
- + }
- + }
- + }
- + } else {
- + if (dns_txt(&text,&tmp) == -1) {
- + flagmustnotbounce = 1;
- + if (flagfailclosed) {
- + if (!stralloc_copys(&text,"temporary RBL lookup error")) nomem();
- + decision = 2;
- + }
- + return;
- }
- - return;
- }
- if (text.len)
- if (flagrblbounce)
-
复制代码
ucspi-tcp-0.88.errno.patch
- diff -u ucspi-tcp-0.88.old/error.h ucspi-tcp-0.88/error.h
- --- ucspi-tcp-0.88.old/error.h 2000-03-18 09:18:20.000000000 -0600
- +++ ucspi-tcp-0.88/error.h 2003-01-08 13:39:12.000000000 -0600
- @@ -1,7 +1,7 @@
- #ifndef ERROR_H
- #define ERROR_H
-
- -extern int errno;
- +#include <errno.h>;
-
- extern int error_intr;
- extern int error_nomem;
复制代码
ucspi-tcp-0.88.nobase.patch
- diff -ur ucspi-tcp-0.88.old/rblsmtpd.c ucspi-tcp-0.88/rblsmtpd.c
- --- ucspi-tcp-0.88.old/rblsmtpd.c Sat Mar 18 09:18:42 2000
- +++ ucspi-tcp-0.88/rblsmtpd.c Mon Apr 1 09:26:07 2002
- @@ -22,7 +22,7 @@
- }
- void usage(void)
- {
- - strerr_die1x(100,"rblsmtpd: usage: rblsmtpd [ -b ] [ -R ] [ -t timeout ] [ -r base ] [ -a base ] smtpd [ arg ... ]");
- + strerr_die1x(100,"rblsmtpd: usage: rblsmtpd -r base [ -b ] [ -R ] [ -t timeout ] [ -r base ] [ -a base ] smtpd [ arg ... ]");
- }
-
- char *ip_env;
- @@ -190,7 +190,7 @@
- argv += optind;
- if (!*argv) usage();
-
- - if (flagwantdefaultrbl) rbl("rbl.maps.vix.com");
- + if (flagwantdefaultrbl) usage();
- if (decision >;= 2) rblsmtpd();
-
- pathexec_run(*argv,argv,envp);
复制代码
qmail-1.03.qmail_local.patch
- diff -u qmail-1.03.old/qmail-local.c qmail-1.03/qmail-local.c
- --- qmail-1.03.old/qmail-local.c 1998-06-15 05:52:55.000000000 -0500
- +++ qmail-1.03/qmail-local.c 2003-01-09 14:22:48.000000000 -0600
- @@ -645,7 +645,7 @@
- {
- cmds.s[j] = 0;
- k = j;
- - while ((k >; i) && (cmds.s[k - 1] == ' ') || (cmds.s[k - 1] == '\t'))
- + while ((k >; i) && ((cmds.s[k - 1] == ' ') || (cmds.s[k - 1] == '\t')))
- cmds.s[--k] = 0;
- switch(cmds.s[i])
- {
复制代码
qmail-1.03.errno.patch
- diff -u qmail-1.03.old/cdb_seek.c qmail-1.03/cdb_seek.c
- --- qmail-1.03.old/cdb_seek.c 1998-06-15 05:52:55.000000000 -0500
- +++ qmail-1.03/cdb_seek.c 2003-01-08 15:55:53.000000000 -0600
- @@ -1,6 +1,5 @@
- #include <sys/types.h>;
- #include <errno.h>;
- -extern int errno;
- #include "cdb.h"
-
- #ifndef SEEK_SET
- diff -u qmail-1.03.old/dns.c qmail-1.03/dns.c
- --- qmail-1.03.old/dns.c 1998-06-15 05:52:55.000000000 -0500
- +++ qmail-1.03/dns.c 2003-01-08 16:00:32.000000000 -0600
- @@ -7,8 +7,6 @@
- #include <errno.h>;
- extern int res_query();
- extern int res_search();
- -extern int errno;
- -extern int h_errno;
- #include "ip.h"
- #include "ipalloc.h"
- #include "fmt.h"
- diff -u qmail-1.03.old/error.3 qmail-1.03/error.3
- --- qmail-1.03.old/error.3 1998-06-15 05:52:55.000000000 -0500
- +++ qmail-1.03/error.3 2003-01-08 15:58:13.000000000 -0600
- @@ -3,8 +3,7 @@
- error \- syscall error codes
- .SH SYNTAX
- .B #include <error.h>;
- -
- -extern int \fBerrno\fP;
- +.B #include <errno.h>;
-
- extern int \fBerror_intr\fP;
- .br
- diff -u qmail-1.03.old/error.h qmail-1.03/error.h
- --- qmail-1.03.old/error.h 1998-06-15 05:52:55.000000000 -0500
- +++ qmail-1.03/error.h 2003-01-08 15:59:13.000000000 -0600
- @@ -1,7 +1,7 @@
- #ifndef ERROR_H
- #define ERROR_H
-
- -extern int errno;
- +#include <errno.h>;
-
- extern int error_intr;
- extern int error_nomem;
复制代码 |
|