Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Jun 2015 04:17:13 +0000 (UTC)
From:      Devin Teske <dteske@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r284716 - stable/10/usr.sbin/bsdconfig/usermgmt/share
Message-ID:  <201506230417.t5N4HDMT059805@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dteske
Date: Tue Jun 23 04:17:12 2015
New Revision: 284716
URL: https://svnweb.freebsd.org/changeset/base/284716

Log:
  MFC r284609: Interim fix for "Login not found" error.
  
  PR:		bin/196514

Modified:
  stable/10/usr.sbin/bsdconfig/usermgmt/share/group.subr
  stable/10/usr.sbin/bsdconfig/usermgmt/share/user.subr
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bsdconfig/usermgmt/share/group.subr
==============================================================================
--- stable/10/usr.sbin/bsdconfig/usermgmt/share/group.subr	Tue Jun 23 04:15:23 2015	(r284715)
+++ stable/10/usr.sbin/bsdconfig/usermgmt/share/group.subr	Tue Jun 23 04:17:12 2015	(r284716)
@@ -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

Modified: stable/10/usr.sbin/bsdconfig/usermgmt/share/user.subr
==============================================================================
--- stable/10/usr.sbin/bsdconfig/usermgmt/share/user.subr	Tue Jun 23 04:15:23 2015	(r284715)
+++ stable/10/usr.sbin/bsdconfig/usermgmt/share/user.subr	Tue Jun 23 04:17:12 2015	(r284716)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506230417.t5N4HDMT059805>