svn commit: r330245 - in head/usr.sbin/pw: . tests
David Bright
dab at FreeBSD.org
Thu Mar 1 17:47:29 UTC 2018
Author: dab
Date: Thu Mar 1 17:47:28 2018
New Revision: 330245
URL: https://svnweb.freebsd.org/changeset/base/330245
Log:
Allow the "@" and "!" characters in passwd file GECOS fields.
Two PRs (152084 & 210187) request allowing the "@" and/or "!"
characters in the passwd file GECOS field. The man page for pw does
not mention that those characters are disallowed, Linux supports those
characters in this field, and the "@" character in particular would be
useful for storing email addresses in that field.
PR: 152084, 210187
Submitted by: jschauma at netmeister.org, Dave Cottlehuber <dch at freebsd.org>
Reported by: jschauma at netmeister.org, Dave Cottlehuber <dch at freebsd.org>
Reviewed by: delphij (secteam), vangyzen
MFC after: 1 week
Sponsored by: Dell EMC
Differential Revision: https://reviews.freebsd.org/D14519
Modified:
head/usr.sbin/pw/pw_user.c
head/usr.sbin/pw/tests/pw_useradd_test.sh
Modified: head/usr.sbin/pw/pw_user.c
==============================================================================
--- head/usr.sbin/pw/pw_user.c Thu Mar 1 17:31:36 2018 (r330244)
+++ head/usr.sbin/pw/pw_user.c Thu Mar 1 17:47:28 2018 (r330245)
@@ -632,7 +632,7 @@ pw_checkname(char *name, int gecos)
reject = 0;
if (gecos) {
/* See if the name is valid as a gecos (comment) field. */
- badchars = ":!@";
+ badchars = ":";
showtype = "gecos field";
} else {
/* See if the name is valid as a userid or group. */
Modified: head/usr.sbin/pw/tests/pw_useradd_test.sh
==============================================================================
--- head/usr.sbin/pw/tests/pw_useradd_test.sh Thu Mar 1 17:31:36 2018 (r330244)
+++ head/usr.sbin/pw/tests/pw_useradd_test.sh Thu Mar 1 17:47:28 2018 (r330245)
@@ -27,9 +27,9 @@ atf_test_case user_add_comments
user_add_comments_body() {
populate_etc_skel
- atf_check -s exit:0 ${PW} useradd test -c "Test User,work,123,456"
- atf_check -s exit:0 -o match:"^test:.*:Test User,work,123,456:" \
- grep "^test:.*:Test User,work,123,456:" $HOME/master.passwd
+ atf_check -s exit:0 ${PW} useradd test -c 'Test User,work!,123,user at example.com'
+ atf_check -s exit:0 -o match:'^test:.*:Test User,work!,123,user at example.com:' \
+ grep '^test:.*:Test User,work!,123,user at example.com:' $HOME/master.passwd
}
# Test add user with comments and option -N
More information about the svn-src-all
mailing list