Browse Source

Localize _new_pexp unconditionally, or rc_read_runfile()

might pick it up from a polluted environment.
Requested by halex@, ok ajacoutot@ halex@
OPENBSD_5_1
schwarze 12 years ago
parent
commit
939836ed72
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      src/etc/rc.d/rc.subr

+ 3
- 2
src/etc/rc.d/rc.subr View File

@ -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}"
}


Loading…
Cancel
Save