From e8e8c939350bdf3c228a411caa9660c607c27a11 Mon Sep 17 00:00:00 2001 From: Devin Teske Date: Fri, 19 Jun 2015 21:32:20 +0000 Subject: [PATCH] Interim fix for "Login not found" error. PR: bin/196514 MFC after: 3 days X-MFC-to: stable/10 --- usr.sbin/bsdconfig/usermgmt/share/group.subr | 10 +++++----- usr.sbin/bsdconfig/usermgmt/share/user.subr | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/usr.sbin/bsdconfig/usermgmt/share/group.subr b/usr.sbin/bsdconfig/usermgmt/share/group.subr index fb320d1d696..e9c8b1637bc 100644 --- a/usr.sbin/bsdconfig/usermgmt/share/group.subr +++ b/usr.sbin/bsdconfig/usermgmt/share/group.subr @@ -82,9 +82,9 @@ f_group_add() # # NB: pw(8) has a ``feature'' wherein `-n name' can be taken as GID # instead of name. Work-around is to also pass `-g GID' at the same - # time (any GID will do; but `-1' is appropriate for this context). + # time (the GID is ignored in this case, so any GID will do). # - if [ "$input" ] && f_quietly pw groupshow -n "$input" -g -1; then + if [ "$input" ] && f_quietly pw groupshow -n "$input" -g 1337; then f_show_err "$msg_group_already_used" "$input" return $FAILURE fi @@ -182,7 +182,7 @@ f_group_add() 1) # Group Name (prompt for new group name) f_dialog_input_group_name input "$group_name" || continue - if f_quietly pw groupshow -n "$input" -g -1; then + if f_quietly pw groupshow -n "$input" -g 1337; then f_show_err "$msg_group_already_used" "$input" continue fi @@ -368,9 +368,9 @@ f_group_edit() # # NB: pw(8) has a ``feature'' wherein `-n name' can be taken as GID # instead of name. Work-around is to also pass `-g GID' at the same - # time (any GID will do; but `-1' is appropriate for this context). + # time (the GID is ignored in this case, so any GID will do). # - if [ "$input" ] && ! f_quietly pw groupshow -n "$input" -g -1; then + if [ "$input" ] && ! f_quietly pw groupshow -n "$input" -g 1337; then f_show_err "$msg_group_not_found" "$input" return $FAILURE fi diff --git a/usr.sbin/bsdconfig/usermgmt/share/user.subr b/usr.sbin/bsdconfig/usermgmt/share/user.subr index d0e38878b34..27d9d665319 100644 --- a/usr.sbin/bsdconfig/usermgmt/share/user.subr +++ b/usr.sbin/bsdconfig/usermgmt/share/user.subr @@ -231,9 +231,9 @@ f_user_add() # # NB: pw(8) has a ``feature'' wherein `-n name' can be taken as UID # instead of name. Work-around is to also pass `-u UID' at the same - # time (any UID will do; but `-1' is appropriate for this context). + # time (the UID is ignored in this case, so any UID will do). # - if [ "$input" ] && f_quietly pw usershow -n "$input" -u -1; then + if [ "$input" ] && f_quietly pw usershow -n "$input" -u 1337; then f_show_err "$msg_login_already_used" "$input" return $FAILURE fi @@ -414,7 +414,7 @@ f_user_add() 1) # Login (prompt for new login name) f_dialog_input_name input "$user_name" || continue - if f_quietly pw usershow -n "$input" -u -1; then + if f_quietly pw usershow -n "$input" -u 1337; then f_show_err "$msg_login_already_used" "$input" continue fi @@ -920,9 +920,9 @@ f_user_edit() # # NB: pw(8) has a ``feature'' wherein `-n name' can be taken as UID # instead of name. Work-around is to also pass `-u UID' at the same - # time (any UID will do; but `-1' is appropriate for this context). + # time (the UID is ignored in this case, so any UID will do). # - if [ "$input" ] && ! f_quietly pw usershow -n "$input" -u -1; then + if [ "$input" ] && ! f_quietly pw usershow -n "$input" -u 1337; then f_show_err "$msg_login_not_found" "$input" return $FAILURE fi -- 2.45.2