> How did you apply the patch over qmailrocks installation? > > Did you have any error from patch?
I tried the automatic patch and I got several errors. Attached is the output from running the different pathces. I then tried to patch it manually following the instructions on http://www.interazioni.it/opensource/chkuser/documentation/installation/ manual.html > You should at least examine smtp_rcpt and post it. Attached are the smtp_mail and smtp_rcpt from my qmailrocks source. My smtp_rcpt seems to be patched with some TLS code. I really don't need that since no clients use it. So if that's in the way it can be removed. I really appreciate you folks helping me out with this!! Regards, Glenn F. Henriksen
[EMAIL PROTECTED] qmail-1.03]# patch < ../../chkuser-2.0.8b-release/netqmail-1.05_chkuser-2.0.8.patch patching file Makefile Hunk #2 succeeded at 316 (offset 12 lines). Hunk #3 FAILED at 1556. 1 out of 3 hunks FAILED -- saving rejects to file Makefile.rej patching file TARGETS Hunk #1 succeeded at 396 (offset 11 lines). patching file chkuser.c patching file chkuser.h patching file chkuser_settings.h patching file conf-cc Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file conf-cc.rej patching file qmail-smtpd.c Hunk #2 FAILED at 34. Hunk #3 succeeded at 419 with fuzz 2 (offset 165 lines). Hunk #4 FAILED at 433. Hunk #5 FAILED at 444. 3 out of 5 hunks FAILED -- saving rejects to file qmail-smtpd.c.rej [EMAIL PROTECTED] qmail-1.03]# patch < ../../chkuser-2.0.8b-release/netqmail-1.05_toaster-0.6-1_chkuser-2.0.8b.patch patching file Makefile Hunk #2 succeeded at 316 (offset 8 lines). Hunk #3 FAILED at 1594. 1 out of 3 hunks FAILED -- saving rejects to file Makefile.rej patching file TARGETS Hunk #1 FAILED at 399. 1 out of 1 hunk FAILED -- saving rejects to file TARGETS.rej The next patch would create the file chkuser.c, which already exists! Assume -R? [n] y patching file chkuser.c The next patch would create the file chkuser.h, which already exists! Assume -R? [n] y patching file chkuser.h The next patch would create the file chkuser_settings.h, which already exists! Assume -R? [n] y patching file chkuser_settings.h Hunk #1 FAILED at 1. File chkuser_settings.h is not empty after patch, as expected 1 out of 1 hunk FAILED -- saving rejects to file chkuser_settings.h.rej patching file conf-cc Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file conf-cc.rej patching file qmail-smtpd.c Hunk #2 succeeded at 101 with fuzz 1 (offset 39 lines). Hunk #3 FAILED at 427. Hunk #4 FAILED at 450. 2 out of 4 hunks FAILED -- saving rejects to file qmail-smtpd.c.rej [EMAIL PROTECTED] qmail-1.03]# patch < ../../chkuser-2.0.8b-release/netqmail-1.05_auth-0.4.2_chkuser-2.0.8.patch patching file Makefile Hunk #2 succeeded at 316 (offset 8 lines). Hunk #3 FAILED at 1556. 1 out of 3 hunks FAILED -- saving rejects to file Makefile.rej patching file Makefile.orig Hunk #2 succeeded at 144 with fuzz 2 (offset 4 lines). Hunk #3 succeeded at 316 (offset 8 lines). Hunk #4 FAILED at 1556. Hunk #5 FAILED at 1574. 2 out of 5 hunks FAILED -- saving rejects to file Makefile.orig.rej patching file TARGETS Hunk #1 succeeded at 396 (offset 10 lines). can't find file to patch at input line 126 Perhaps you should have used the -p or --strip option? The text leading up to this was: -------------------------- |diff -NU3 ./auth.log ../netqmail-1.05-auth-0.4.2-chkuser-2.0.8/auth.log |--- ./auth.log Thu Sep 9 22:10:48 2004 |+++ ../netqmail-1.05-auth-0.4.2-chkuser-2.0.8/auth.log Wed Dec 1 18:37:36 2004 -------------------------- File to patch: Skip this patch? [y] y Skipping patch. 2 out of 2 hunks ignored patching file chkuser.c patching file chkuser.h patching file chkuser_settings.h patching file conf-cc Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file conf-cc.rej patching file qmail-smtpd.c Hunk #2 FAILED at 36. Hunk #3 succeeded at 420 with fuzz 2 (offset 145 lines). Hunk #4 FAILED at 434. Hunk #5 FAILED at 445. 3 out of 5 hunks FAILED -- saving rejects to file qmail-smtpd.c.rej
qmail-smtpd.c
Description: qmail-smtpd.c