bin/163863: confusing usr.sbin/adduser output if /etc/adduser.conf contains uidstart directive

[Moritz Wilhelmy]

>Number:         163863
>Category:       bin
>Synopsis:       confusing usr.sbin/adduser output if /etc/adduser.conf contains uidstart directive
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 06 13:40:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Moritz Wilhelmy
>Release:        FreeBSD 9.0-RC2 amd64
>Organization:
>Environment:
System: FreeBSD furnace.wzff.de 9.0-RC2 FreeBSD 9.0-RC2 #14: Wed Nov 9 10:27:26 UTC 2011 root at phallus.wzff.de:/usr/obj/usr/src/sys/PHALLUS amd64

>Description:
	if uidstart is set (for instance to 2000) in adduser.conf, adduser will
	always prompt Uid [2000]:, although it internally increases the UID for
	newly created users after the prompt is printed
>How-To-Repeat:
	# echo uidstart=2000 >> /etc/adduser.conf
	# adduser
	Username: lola
	Full name: & Foo
	Uid [2000]: FIXME
>Fix:
Maybe this:

--- /usr/sbin/adduser	2011-11-09 13:34:50.891925440 +0100
+++ adduser	2012-01-06 14:25:53.344752556 +0100
@@ -488,6 +488,7 @@
 	_prompt=
 
 	if [ -n "$uuid" ]; then
+		uuid=`get_nextuid $uuid`
 		_prompt="Uid [$uuid]: "
 	else
 		_prompt="Uid (Leave empty for default): "
@@ -500,7 +501,6 @@
 	fi
 
 	[ -n "$_input" ] && uuid=$_input
-	uuid=`get_nextuid $uuid`
 	uidstart=$uuid
 }
 
>Release-Note:
>Audit-Trail:
>Unformatted: