Hi, Thank you for your patch, but it shows errors, so if you have only the patch with smtp-auth and chkuser i like it.
Thanks! patching file FILES Hunk #1 succeeded at 135 (offset -1 lines). Hunk #2 succeeded at 337 (offset -1 lines). Hunk #3 succeeded at 406 (offset -1 lines). patching file MakeArgs.c patching file Makefile patching file Makefile-cert.mk patching file TARGETS patching file alloc.c patching file auto-int.c patching file auto-int8.c patching file auto-str.c patching file base64.c patching file base64.h patching file byte.h patching file byte_cspn.c patching file byte_rcspn.c patching file case_startb.c patching file chkspawn.c patching file chkuser.c patching file chkuser.h patching file chkuser_settings.h patching file conf-cc patching file conf-spawn patching file control.c patching file control.h patching file dk-filter.9 patching file dk-filter.sh patching file dkim.h patching file dkimbase.cpp patching file dkimbase.h patching file dkimdns.cpp patching file dkimdns.h patching file dkimfuncs.cpp patching file dkimsign.cpp patching file dkimsign.h patching file dkimtest.c patching file dkimverify.cpp patching file dkimverify.h patching file dktrace.h patching file dns.c Hunk #1 succeeded at 11 with fuzz 1 (offset 2 lines). Hunk #2 succeeded at 22 (offset 2 lines). Hunk #3 succeeded at 49 (offset 2 lines). Hunk #4 succeeded at 85 (offset 2 lines). Hunk #5 succeeded at 198 (offset 2 lines). Hunk #6 succeeded at 299 (offset 2 lines). Hunk #7 succeeded at 321 (offset 2 lines). Hunk #8 succeeded at 379 (offset 2 lines). Hunk #9 succeeded at 408 (offset 2 lines). Hunk #10 succeeded at 420 (offset 2 lines). Hunk #11 succeeded at 490 (offset 2 lines). patching file dns.h patching file dnsfq.c patching file dnsptr.c patching file dnstxt.c patching file domainkeys.h patching file global.h patching file hier.c patching file hmac_md5.c patching file hmac_md5.h patching file ip.h patching file ipalloc.h patching file macros.h patching file maildirflags.c patching file maildirgetquota.c patching file maildirgetquota.h patching file maildirmisc.h patching file maildiropen.c patching file maildirparsequota.c patching file maildirquota.c patching file maildirquota.h patching file md5.h patching file md5c.c patching file numlib.h patching file overmaildirquota.c patching file qmail-control.9 patching file qmail-dk.8 patching file qmail-dk.c patching file qmail-dkim.9 patching file qmail-dkim.c patching file qmail-inject.c patching file qmail-local.c patching file qmail-lspawn.c patching file qmail-pop3d.c Hunk #3 FAILED at 81. Hunk #5 FAILED at 182. Hunk #6 FAILED at 228. 3 out of 9 hunks FAILED -- saving rejects to file qmail-pop3d.c.rej patching file qmail-popup.c Hunk #3 FAILED at 66. 1 out of 4 hunks FAILED -- saving rejects to file qmail-popup.c.rej patching file qmail-pw2u.c patching file qmail-qmtpd.c patching file qmail-remote.8 patching file qmail-remote.c patching file qmail-rspawn.c patching file qmail-send.9 patching file qmail-send.c patching file qmail-showctl.c patching file qmail-smtpd.8 patching file qmail-smtpd.c Hunk #2 FAILED at 68. Hunk #3 succeeded at 103 with fuzz 1. Hunk #7 succeeded at 300 with fuzz 1. 1 out of 13 hunks FAILED -- saving rejects to file qmail-smtpd.c.rej patching file qmail.c Hunk #1 FAILED at 23. Hunk #2 succeeded at 40 (offset -11 lines). Hunk #3 succeeded at 88 (offset -11 lines). Hunk #4 succeeded at 119 (offset -11 lines). Hunk #5 succeeded at 139 (offset -11 lines). 1 out of 5 hunks FAILED -- saving rejects to file qmail.c.rej patching file qmail.h patching file qregex.c patching file qregex.h patching file qsutil.c patching file qsutil.h patching file scan_ulong.c patching file select.h2 patching file softwarelicense1-1.html patching file spawn-filter.9 patching file spawn-filter.c patching file spawn.c Hunk #2 succeeded at 6 with fuzz 2 (offset -1 lines). Hunk #3 succeeded at 62 (offset -1 lines). Hunk #4 succeeded at 72 (offset -1 lines). Hunk #5 succeeded at 155 (offset -1 lines). Hunk #6 succeeded at 204 (offset -1 lines). Hunk #7 succeeded at 240 (offset -1 lines). patching file spf.c patching file spf.h patching file spfquery.c patching file ssl_timeoutio.c patching file ssl_timeoutio.h patching file str.h patching file str_cpyb.c patching file strpidt.c patching file strsalloc.c patching file strsalloc.h patching file strtimet.c patching file tcp-env.c patching file tls.c patching file tls.h patching file update_tmprsadh.sh patching file wildmat.c -----Message d'origine----- De : Roberto Puzzanghera [mailto:ad...@sagredo.eu] Envoyé : mercredi 4 mai 2011 13:14 À : vchkpw@inter7.com Objet : Re: [vchkpw] Qmail + chkuser + smtp-auth Hi, I have a patch here http://notes.sagredo.eu/node/82 including the latest versions of smtp-auth by E.Hoffmann, smtp-tls by F.Vermulen and chkuser. I can put together a package with just smtp-auth and chkuser if you like.. Anyway you can do it by yourself applying chkuser over smtp-tls and following the directives of the author of chkuser http://www.interazioni.it/opensource/chkuser/documentation/installation/manu al.html best regards Roberto Puzzanghera On Wed, 4 May 2011 09:56:15 +0200, OVH wrote: > Hi, > > On my Qmail 1.03 I can not simultaneously apply smtp-auth patch > (qmail-smtpd-auth-0510) and chkuser (chkuser-2.0.8b-release or > chkuser-2.0.9-release). > It seems that there is a conflict between these two patches. you know > a > patch which includes 2 or a solution to the conflict ? > > Thanks! > > > > !DSPAM:4dc1475932712013466953!
