28c28
< # $FreeBSD: head/usr.sbin/bsdconfig/usermgmt/share/group.subr 262904 2014-03-07 20:44:19Z dteske $
---
> # $FreeBSD: stable/10/usr.sbin/bsdconfig/usermgmt/share/group.subr 263980 2014-04-01 00:19:13Z dteske $
98a99,102
> if [ ! "$group_name" ]; then
> f_show_err "$msg_no_group_specified"
> return $FAILURE
> fi
155,156c159,167
< local cmd="pw groupadd -n '$group_name'"
< [ "$group_gid" ] && cmd="$cmd -g '$group_gid'"
---
> local var
> for var in gid members name; do
> local _group_$var
> eval f_shell_escape \
> \"\$group_$var\" _group_$var
> done
>
> local cmd="pw groupadd -n '$_group_name'"
> [ "$group_gid" ] && cmd="$cmd -g '$_group_gid'"
158c169
< cmd="$cmd -M '$group_members'"
---
> cmd="$cmd -M '$_group_members'"
166c177
< pw '%s -h 0' "$cmd"
---
> pw '%s -h 0' "$cmd"
194a206,211
> local var
> for var in gid members name; do
> local _group_$var
> eval f_shell_escape \"\$group_$var\" _group_$var
> done
>
196,198c213,215
< local cmd="pw groupadd -n '$group_name'"
< [ "$group_gid" ] && cmd="$cmd -g '$group_gid'"
< [ "$group_members" ] && cmd="$cmd -M '$group_members'"
---
> local cmd="pw groupadd -n '$_group_name'"
> [ "$group_gid" ] && cmd="$cmd -g '$_group_gid'"
> [ "$group_members" ] && cmd="$cmd -M '$_group_members'"
205,206c222,223
< 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 )
220c237
< [ "$no_confirm" -a "$USE_DIALOG" ] && sleep 2
---
> [ "$no_confirm" -a "$USE_DIALOG" ] && sleep 1
274a292,293
> local _group_name
> f_shell_escape "$group_name" _group_name
276c295
< "$group_name" && break
---
> "$_group_name" && break
295c314,315
< local retval err
---
> local retval err _group_name
> f_shell_escape "$group_name" _group_name
297c317
< 'pw groupdel "%s"' "$group_name"
---
> "pw groupdel '%s'" "$_group_name"
308c328
< [ "$no_confirm" -a "$USE_DIALOG" ] && sleep 2
---
> [ "$no_confirm" -a "$USE_DIALOG" ] && sleep 1
327c347,349
< # If NULL or unset, group membership is unmodified.
---
> # If set but NULL, group memberships are reset (no users will be
> # a member of this group). If unset, group membership is
> # unmodified.
403,404c425,433
< local cmd="pw groupmod -n '$group_name'"
< [ "$group_gid" ] && cmd="$cmd -g '$group_gid'"
---
> local var
> for var in gid members name; do
> local _group_$var
> eval f_shell_escape \
> \"\$group_$var\" _group_$var
> done
>
> local cmd="pw groupmod -n '$_group_name'"
> [ "$group_gid" ] && cmd="$cmd -g '$_group_gid'"
406c435
< cmd="$cmd -M '$group_members'"
---
> cmd="$cmd -M '$_group_members'"
412,414c441,442
< echo "$group_password" |
< f_eval_catch $funcname \
< pw '%s -h 0' "$cmd"
---
> echo "$group_password" | f_eval_catch \
> $funcname pw '%s -h 0' "$cmd"
427c455
< # Attempt to fall back to prevoius selection
---
> # Attempt to fall back to previous selection
448a477,482
> local var
> for var in gid members name; do
> local _group_$var
> eval f_shell_escape \"\$group_$var\" _group_$var
> done
>
450,451c484,485
< local cmd="pw groupmod -n '$group_name'"
< [ "$group_gid" ] && cmd="$cmd -g '$group_gid'"
---
> local cmd="pw groupmod -n '$_group_name'"
> [ "$group_gid" ] && cmd="$cmd -g '$_group_gid'"
453c487
< cmd="$cmd -M '$group_members'"
---
> cmd="$cmd -M '$_group_members'"
460,461c494,495
< 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 )
475c509
< [ "$no_confirm" -a "$USE_DIALOG" ] && sleep 2
---
> [ "$no_confirm" -a "$USE_DIALOG" ] && sleep 1