Fix a bug preventing errors from pw(8) from filtering up to a dialog.

Programs running as rvalue to pipe cannot access current namespace.
This commit is contained in:
Devin Teske 2014-03-14 03:33:03 +00:00
parent 160c413360
commit faae0586c2
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=263147

View File

@ -202,8 +202,8 @@ f_group_add()
if [ "$group_password_disable" ]; then
f_eval_catch -k err $funcname pw '%s -h -' "$cmd"
elif [ "$group_password" ]; then
echo "$group_password" | f_eval_catch -k err \
$funcname pw '%s -h 0' "$cmd"
err=$( echo "$group_password" | f_eval_catch -de \
$funcname pw '%s -h 0' "$cmd" 2>&1 )
else
f_eval_catch -k err $funcname pw '%s' "$cmd"
fi
@ -458,8 +458,8 @@ f_group_edit()
if [ "$group_password_disable" ]; then
f_eval_catch -k err $funcname pw '%s -h -' "$cmd"
elif [ "$group_password" -o "$null_password" ]; then
echo "$group_password" | f_eval_catch -k err \
$funcname pw '%s -h 0' "$cmd"
err=$( echo "$group_password" | f_eval_catch -de \
$funcname pw '%s -h 0' "$cmd" 2>&1 )
else
f_eval_catch -k err $funcname pw '%s' "$cmd"
fi