There is a missing double quote " in 8.3 & 9.0 & 9.1RC2 src/etc/sendmail/freebsd.mc 8.2-RELEASE & earlier are OK. Fix: I append my http://berklix.com/~jhs/src/bsd/fixes/FreeBSD/src/gen/etc/sendmail/freebsd.mc.REL=9.0-RELEASE.diff This patch applies to 8.3-RELEASE and 9.0-RELEASE & 9.1RC3. It is not needed for 8.2-RELEASE & earlier. --------- http://lists.freebsd.org/pipermail/freebsd-hackers/2012-December/041333.html { ] To: hackers@@freebsd.org ] cc: re@@freebsd.org ] Subject: Missing quote in comment in 8.3 & 9.0 & 9.1RC2 etc/sendmail/freebsd.mc ] From: "Julian H. Stacey" <jhs@@berklix.com> ] Organization: http://berklix.com BSD Linux Unix Consultancy, Munich Germany ] Fcc: sent ] User-agent: EXMH on FreeBSD http://www.berklix.com/free/ ] X-URL: http://www.berklix.com/~jhs/cv/ ] ] Hi hackers@@freebsd.org ] ] There is a missing double quote " in ] 8.3 & 9.0 & 9.1RC2 src/etc/sendmail/freebsd.mc ] 8.2-RELEASE & earlier are OK. ] ] Here's a diff -c to .mc ] The diff is not to fix it, but to help generate a freebsd.cf to ] understand the difference. The patch for a fix would befar more trivial :-) ] ] ------ ] *** 9.1-RC3/src/etc/sendmail/freebsd.mc Mon Oct 29 21:16:44 2012 ] --- 9.1-RC3/src+debug/etc/sendmail/freebsdjhs.mc Mon Dec 3 18:44:33 2012 ] *************** ] *** 66,75 **** ] dnl For that, visit ] dnl http://www.google.com/Top/Computers/Internet/E-mail/Spam/Blacklists/ ] ] ! dnl Uncomment to activate your chosen DNS based blacklist ] ! dnl FEATURE(dnsbl, `dnsbl.example.com') ] ! dnl Alternatively, you can provide your own server and rejection message: ] ! dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected'') ] ] dnl Dialup users should uncomment and define this appropriately ] dnl define(`SMART_HOST', `your.isp.mail.server') ] --- 66,77 ---- ] dnl For that, visit ] dnl http://www.google.com/Top/Computers/Internet/E-mail/Spam/Blacklists/ ] ] ! # Uncomment to activate your chosen DNS based blacklist ] ! FEATURE(dnsbl, `jhs0.dnsbl.example.com') ] ! # Alternatively, you can provide your own server and rejection message: ] ! FEATURE(dnsbl, `jhs3.dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected'') ] ! # original line above has 3 x " , line below has 4 ] ! FEATURE(dnsbl, `jhs4.dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected"'') ] ] dnl Dialup users should uncomment and define this appropriately ] dnl define(`SMART_HOST', `your.isp.mail.server') ] ------ ] ] The .cf output is ] ------ ] # DNS based IP address spam list jhs0.dnsbl.example.com ] R$* $: $&{client_addr} ] R$-.$-.$-.$- $: <?> $(dnsbl $4.$3.$2.$1.jhs0.dnsbl.example.com. $: OK $) ] R<?>OK $: OKSOFAR ] R<?>$+<TMP> $: TMPOK ] R<?>$+ $#error $@ 5.7.1 $: "550 Rejected: " $&{client_addr} " listed at jhs0.dnsbl.example.com" ] ] # DNS based IP address spam list jhs3.dnsbl.example.com ] R$* $: $&{client_addr} ] R$-.$-.$-.$- $: <?> $(dnsbl $4.$3.$2.$1.jhs3.dnsbl.example.com. $: OK $) ] R<?>OK $: OKSOFAR ] R<?>$+<TMP> $: TMPOK ] R<?>$+ $#error $@ 5.7.1 $: "550 Mail from " $&{client_addr} " rejected ] ] # DNS based IP address spam list jhs4.dnsbl.example.com ] R$* $: $&{client_addr} ] R$-.$-.$-.$- $: <?> $(dnsbl $4.$3.$2.$1.jhs4.dnsbl.example.com. $: OK $) ] R<?>OK $: OKSOFAR ] R<?>$+<TMP> $: TMPOK ] R<?>$+ $#error $@ 5.7.1 $: "550 Mail from " $&{client_addr} " rejected" ] ------ ] Above, jhs3 seems bad & jhs4 seems good. ] ] A copy of this diff + follow up is in ] http://berklix.com/~jhs/src/bsd/fixes/FreeBSD/src/gen/etc/sendmail/freebsd.mc.REL=ALL.diff ] ] The error appeared in 8.3 & 9.0 & 9.1RC3, it was OK earlier : ] ] 4.11-RELEASE/src/etc/sendmail/freebsd.mc:dnl FEATURE(dnsbl, `blackholes.mail-abuse.org', `"550 Mail from " $&{client_addr} " rejected, see http://mail-abuse.org/cgi-bin/lookup?" $&{client_addr}') ] ] 6.4-RELEASE/src/etc/sendmail/freebsd.mc:dnl FEATURE(dnsbl, `blackholes.mail-abuse.org', ``"550 Mail from " $&{client_addr} " rejected, see http://mail-abuse.org/cgi-bin/lookup?" $&{client_addr}'') ] ] 7.3-RELEASE/src/etc/sendmail/freebsd.mc:dnl FEATURE(dnsbl, `blackholes.mail-abuse.org', ``"550 Mail from " $&{client_addr} " rejected, see http://mail-abuse.org/cgi-bin/lookup?" $&{client_addr}'') ] ] 7.4-RELEASE/src/etc/sendmail/freebsd.mc:dnl FEATURE(dnsbl, `blackholes.mail-abuse.org', ``"550 Mail from " $&{client_addr} " rejected, see http://mail-abuse.org/cgi-bin/lookup?" $&{client_addr}'') ] ] 8.2-RELEASE/src/etc/sendmail/freebsd.mc:dnl FEATURE(dnsbl, `blackholes.mail-abuse.org', ``"550 Mail from " $&{client_addr} " rejected, see http://mail-abuse.org/cgi-bin/lookup?" $&{client_addr}'') ] ] 8.3-RELEASE/src/etc/sendmail/freebsd.mc:dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected'') ] ] 9.0-RELEASE/src/etc/sendmail/freebsd.mc:dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected'') ] ] 9.1-RC3//src/etc/sendmail/freebsd.mc:dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected'') ] ] ] Why others didnt notice earlier: ] It's just a comment, I assume not checked by anything automatic at ] freebsd.org. ] ] How I caught it: ] I have my own src/etc/sendmail/ Makefile diffs & fdef'd common.cpp ] that generates various .mc files for each of my hosts, & many ] versions, which filters the .cpp to create .mcfiles, inc. a check ] file that should be an exact match with that version's freebsd.mc ] ... & cpp complained: unmatched ". ] ] I will send-pr unless I hear otherwise. ] But as 9.1-RELEASE is imminent, & it would be a trivial anodyne ] fix to a comment for re@ , so they want to fix, so cc'd to re@. ] ] Cheers, ] Julian ] -- ] Julian Stacey, BSD Unix Linux C Sys Eng Consultant, Munich http://berklix.com ] Reply below not above, like a play script. Indent old text with "> ". ] Send plain text. Not: HTML, multipart/alternative, base64, quoted-printable. }--yYp1BhEpG6eMiiQpw4fY4NiqFoWp0iTZELqzR7b5cdYEH9xE Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" *** 9.1-RC3/src/etc/sendmail/freebsd.mc Tue Dec 4 15:41:28 2012 --- new-generic/src/etc/sendmail/freebsd.mc Tue Dec 4 15:42:09 2012 *************** *** 69,75 **** dnl Uncomment to activate your chosen DNS based blacklist dnl FEATURE(dnsbl, `dnsbl.example.com') dnl Alternatively, you can provide your own server and rejection message: ! dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected'') dnl Dialup users should uncomment and define this appropriately dnl define(`SMART_HOST', `your.isp.mail.server') --- 69,75 ---- dnl Uncomment to activate your chosen DNS based blacklist dnl FEATURE(dnsbl, `dnsbl.example.com') dnl Alternatively, you can provide your own server and rejection message: ! dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected"'') dnl Dialup users should uncomment and define this appropriately dnl define(`SMART_HOST', `your.isp.mail.server') --------- How-To-Repeat: See posting below
Responsible Changed From-To: freebsd-bugs->gshapiro Over to sendmail maintainer
Author: gshapiro Date: Sat Dec 29 19:57:52 2012 New Revision: 244830 URL: http://svnweb.freebsd.org/changeset/base/244830 Log: Add missing closing quote on commented out example PR: bin/174108 Obtained from: Julian H. Stacey MFC after: 1 day Modified: head/etc/sendmail/freebsd.mc Modified: head/etc/sendmail/freebsd.mc ============================================================================== --- head/etc/sendmail/freebsd.mc Sat Dec 29 19:13:16 2012 (r244829) +++ head/etc/sendmail/freebsd.mc Sat Dec 29 19:57:52 2012 (r244830) @@ -69,7 +69,7 @@ dnl http://www.google.com/Top/Computers/ dnl Uncomment to activate your chosen DNS based blacklist dnl FEATURE(dnsbl, `dnsbl.example.com') dnl Alternatively, you can provide your own server and rejection message: -dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected'') +dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected"'') dnl Dialup users should uncomment and define this appropriately dnl define(`SMART_HOST', `your.isp.mail.server') _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
State Changed From-To: open->feedback Patch committed to HEAD. State will be set to closed when patch MFC'ed.
State Changed From-To: feedback->closed Change has been MFC'ed to supported branches (7, 8, 9)