"Nguyen Dang Phuoc Dong" <[EMAIL PROTECTED]> wrote:
>After applied Qmail-UCE patch, I can't continue with the tarpit patch, and
>vice versa. The attach file is the qmail-smtpd.c.rej. Please tell me what I
>have to do? I'm not familiar with patch/diff program.
"man diff" and "man patch", if available, should help, but basically
diff just compares two files and displays the differences by line
number. Since you've applied one patch already, your line numbers
don't match those in the second patch. Given the "context" (unchanged
lines surrounding a change), patch can usually figure out where to
make the change. If it can't, it creates a .rej file containing the
unapplied patches, which you can manually apply.
>***************
>*** 96,101 ****
> int bmfok = 0;
> stralloc bmf = {0};
> struct constmap mapbmf;
>
> void setup()
> {
>--- 96,103 ----
> int bmfok = 0;
> stralloc bmf = {0};
> struct constmap mapbmf;
>+ int tarpitcount = 0;
>+ int tarpitdelay = 5;
>
> void setup()
> {
For example, in qmail-smtpd.c, in the vicinity of line 96, locate the
declaration of mapbmf and add the lines declaring tarpitcount and
tarpitdelay.
-Dave
