From 939836ed728cdf6f840b2c43b6425e355dbffc32 Mon Sep 17 00:00:00 2001
From: schwarze <>
Date: Wed, 12 Oct 2011 23:04:02 +0000
Subject: [PATCH] Localize _new_pexp unconditionally, or rc_read_runfile()
 might pick it up from a polluted environment. Requested by halex@, ok
 ajacoutot@ halex@

---
 src/etc/rc.d/rc.subr | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/etc/rc.d/rc.subr b/src/etc/rc.d/rc.subr
index 58af023f..8cec9992 100644
--- a/src/etc/rc.d/rc.subr
+++ b/src/etc/rc.d/rc.subr
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.subr,v 1.53 2011/10/09 16:46:55 schwarze Exp $
+#	$OpenBSD: rc.subr,v 1.54 2011/10/12 23:04:02 schwarze Exp $
 #
 # Copyright (c) 2010, 2011 Antoine Jacoutot <ajacoutot@openbsd.org>
 # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -34,7 +34,8 @@ rc_write_runfile() {
 }
 
 rc_read_runfile() {
-	[ -f ${_RC_RUNFILE} ] && local _new_pexp=$(< ${_RC_RUNFILE})
+	local _new_pexp
+	[ -f ${_RC_RUNFILE} ] && _new_pexp=$(< ${_RC_RUNFILE})
 	[ -n "${_new_pexp}" ] && pexp="${_new_pexp}"
 }