Dear all,
I am using netqmail 1.05 now. After I patched qmail-toaster-0.6-1+greylisting.patch, then I patch chkuser-0.6.mysql.patch. However, I got the follow error.
patching file ./conf-mysql
patching file ./conf-vpopmail
patching file ./Makefile
Hunk #2 succeeded at 1584 with fuzz 2.
patching file ./qmail-smtpd.c
Hunk #1 succeeded at 25 (offset 2 lines).
Hunk #2 succeeded at 63 (offset 2 lines).
Hunk #3 succeeded at 323 (offset 4 lines).
Hunk #4 FAILED at 610.
1 out of 4 hunks FAILED -- saving rejects to file ./qmail-smtpd.c.rej
What should I do to fix the problem?
Regards,
Qing.
--------quote of qmail-smtp.c.rej--------------- *************** *** 413,418 **** } else if (!addrallowed()) { err_nogateway(); return; } if (!stralloc_cats(&rcptto,"T")) die_nomem(); if (!stralloc_cats(&rcptto,addr.s)) die_nomem(); if (!stralloc_0(&rcptto)) die_nomem(); --- 610,616 ---- } else if (!addrallowed()) { err_nogateway(); return; } + if (!realrcpt_check()) { err_realrcpt(); return; } if (!stralloc_cats(&rcptto,"T")) die_nomem(); if (!stralloc_cats(&rcptto,addr.s)) die_nomem(); if (!stralloc_0(&rcptto)) die_nomem(); ----------End of Quote---------------
This patch does not apply cleanly. You need to apply this hunk manually to qmail-smtpd.c.
Regards,
Bill
