Hi
I am unable to apply the path mentioned in
<http://www.ornl.gov/its/archives/mailing-lists/qmail/1999/10/msg01093.html>
to scanmails.in?
I get this messages:
patching file scanmails.in
Hunk #4 FAILED at 900.
1 out of 5 hunks FAILED -- saving rejects to file scanmails.in.rej
The scanmails.in.rej is attached.
Any ideas?
--
/hans
***************
*** 897,929 ****
else
echo No virus found - good >> ${tmpdir}/logfile
- if [ "x${deliver}" != "x" ] && [ -x ${deliver} ] ; then
if [ "x$x_header" = "xyes" ] && [ "x${formail}" != "x" ] && [ -x ${formail} ] ;
then
- if [ "x${usingqmail}" != "x" ]; then
- # If invoked as anything other than "scanmails", invoke the real
- # program else fall thru to exit
- if [ "${scanscriptname}" != "scanmails" ] ; then
- cat ${tmpdir}/receivedmail |\
- ${formail} -f \
- -A "${X_Header_String}" \
- | ${scanscriptname}-real "$@"
- fi
- else
- cat ${tmpdir}/receivedmail |\
- ${formail} -f \
- -A "${X_Header_String}" \
- | ${deliver} "$@"
fi
else
- if [ "x${usingqmail}" != "x" ]; then
- # If invoked as anything other than "scanmails", invoke the real
- # program else fall thru to exit
- if [ "${scanscriptname}" != "scanmails" ] ; then
- ${scanscriptname}-real "$@" < ${tmpdir}/receivedmail
- fi
- else
- ${deliver} "$@" <${tmpdir}/receivedmail
- fi
fi
else
pid=$$
--- 900,926 ----
else
echo No virus found - good >> ${tmpdir}/logfile
+ if [ "x${usingqmail}" != "x" ]; then
if [ "x$x_header" = "xyes" ] && [ "x${formail}" != "x" ] && [ -x ${formail} ] ;
then
+ if [ "${scanscriptname}" != "scanmails" ] ; then
+ cat ${tmpdir}/receivedmail |\
+ ${formail} -f \
+ -A "${X_Header_String}" \
+ | ${scanscriptname}-real "$@"
+ fi
+ else
+ if [ "${scanscriptname}" != "scanmails" ] ; then
+ ${scanscriptname}-real "$@" < ${tmpdir}/receivedmail
fi
+ fi
+ elif [ "x${deliver}" != "x" ] && [ -x ${deliver} ] ; then
+ if [ "x$x_header" = "xyes" ] && [ "x${formail}" != "x" ] && [ -x ${formail} ] ;
+then
+ cat ${tmpdir}/receivedmail |\
+ ${formail} -f \
+ -A "${X_Header_String}" \
+ | ${deliver} "$@"
else
+ ${deliver} "$@" <${tmpdir}/receivedmail
fi
else
pid=$$
