diff options
| author | Alexander Hall <halex@cvs.openbsd.org> | 2012-07-12 10:42:49 +0000 |
|---|---|---|
| committer | Alexander Hall <halex@cvs.openbsd.org> | 2012-07-12 10:42:49 +0000 |
| commit | 3cc28fcf747141faea1200e549a2e51c0ad8885e (patch) | |
| tree | 392591397a9385018d07535e8ed13f0556ddbb89 | |
| parent | 97f738b593092e5a32d94f610e5ced8bfec27e8c (diff) | |
ksh does not properly separate the arguments in "$@" if IFS is an
empty string.
Since some places in the installer like to fiddle with IFS before
calling the various ask functions, be sure to use the positional
parameters one by one in those.
I believe the fix should really be applied to ksh, but this should
do for now.
ok deraadt@
| -rw-r--r-- | distrib/miniroot/install.sub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 2059671a77e..33ae4e6e2e8 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.659 2012/07/09 10:51:10 halex Exp $ +# $OpenBSD: install.sub,v 1.660 2012/07/12 10:42:48 halex Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -275,7 +275,7 @@ _ask() { # Any parameters are passed on to _ask(), which is called # repeatedly until it succeds. ask() { - while ! _ask "$@"; do done + while ! _ask "$1" "$2"; do done } # Ask for a password twice, saving the input in $_password |