From owner-cvs-all@FreeBSD.ORG Fri Oct 19 22:55:44 2007 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3CF9C16A41B; Fri, 19 Oct 2007 22:55:44 +0000 (UTC) (envelope-from mtm@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1435D13C459; Fri, 19 Oct 2007 22:55:44 +0000 (UTC) (envelope-from mtm@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9JMtiwa002883; Fri, 19 Oct 2007 22:55:44 GMT (envelope-from mtm@repoman.freebsd.org) Received: (from mtm@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9JMtgR5002882; Fri, 19 Oct 2007 22:55:42 GMT (envelope-from mtm) Message-Id: <200710192255.l9JMtgR5002882@repoman.freebsd.org> From: Mike Makonnen Date: Fri, 19 Oct 2007 22:55:42 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/etc/rc.d amd X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Oct 2007 22:55:44 -0000 mtm 2007-10-19 22:55:42 UTC FreeBSD src repository Modified files: etc/rc.d amd Log: The amd_map_program knob can potentially contain a command whose output is then used as an argument to the amd program. This outpu may contain newlines, but the script did not take care to strip those newlines before apending it to rc_flags. Revision 1.72 of rc.subr(8) introduced changes that exposed this problem (specifically putting the final eval'ed command in quotes).[1] Also, for correctness' sake, shell directives appended to the command-line by the script should go into command_args, and not appended directly to rc_flags. Reported by: John E Hein [1] Tested by: John E Hein MFC after: 1 week Revision Changes Path 1.19 +3 -2 src/etc/rc.d/amd