From owner-cvs-all@FreeBSD.ORG Sun Oct 28 20:07:30 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 0668216A418; Sun, 28 Oct 2007 20:07:30 +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 EAAA313C49D; Sun, 28 Oct 2007 20:07:29 +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 l9SK7Tf5033448; Sun, 28 Oct 2007 20:07:29 GMT (envelope-from mtm@repoman.freebsd.org) Received: (from mtm@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SK7TQL033447; Sun, 28 Oct 2007 20:07:29 GMT (envelope-from mtm) Message-Id: <200710282007.l9SK7TQL033447@repoman.freebsd.org> From: Mike Makonnen Date: Sun, 28 Oct 2007 20:07:29 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_7 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: Sun, 28 Oct 2007 20:07:30 -0000 mtm 2007-10-28 20:07:29 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) etc/rc.d amd Log: MFC: rev. 1.19 and 1.20 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. Approved by: re (kensmith) Revision Changes Path 1.18.2.1 +3 -2 src/etc/rc.d/amd