From fpscha@mecon.gov.ar  Thu Jan  9 05:01:58 2003
Return-Path: <fpscha@mecon.gov.ar>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E174F37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Jan 2003 05:01:57 -0800 (PST)
Received: from relay2.mecon.ar (relay2.mecon.ar [168.101.16.11])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F247D43EB2
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Jan 2003 05:01:55 -0800 (PST)
	(envelope-from fpscha@mecon.gov.ar)
Received: from racing.mecon.ar (racing.mecon.ar [168.101.133.15])
	by relay2.mecon.ar (8.12.6/8.12.6) with ESMTP id h09D1r71025499
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 9 Jan 2003 10:01:54 -0300 (ART)
	(envelope-from fpscha@mecon.gov.ar)
Received: from racing.mecon.ar (meyosp.mecon.gov.ar [10.11.0.149])
	by racing.mecon.ar (8.11.1/8.8.5) with ESMTP id h09D1mx52698
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 9 Jan 2003 10:01:48 -0300 (ART)
Received: from bal740r0.mecon.gov.ar (bal740r0.mecon.ar [10.11.1.11])
	by racing.mecon.ar (8.11.1/8.8.5) with ESMTP id h09D1mi52693
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 9 Jan 2003 10:01:48 -0300 (ART)
Received: from bal740r0.mecon.gov.ar (localhost [127.0.0.1])
	by bal740r0.mecon.gov.ar (8.12.6/8.12.6) with ESMTP id h09D2XSv000737
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 9 Jan 2003 10:02:33 -0300 (ART)
	(envelope-from fpscha@bal740r0.mecon.gov.ar)
Received: (from fpscha@localhost)
	by bal740r0.mecon.gov.ar (8.12.6/8.12.6/Submit) id h09D2WPE000736;
	Thu, 9 Jan 2003 10:02:32 -0300 (ART)
	(envelope-from fpscha)
Message-Id: <200301091302.h09D2WPE000736@bal740r0.mecon.gov.ar>
Date: Thu, 9 Jan 2003 10:02:32 -0300 (ART)
From: Fernando Schapachnik <fernando@mecon.gov.ar>
Reply-To: Fernando Schapachnik <fernando@mecon.gov.ar>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] pw doesn't accept characters like $ although it should according to passwd(5)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         46890
>Category:       bin
>Synopsis:       [PATCH] pw doesn't accept characters like $ although it should according to passwd(5)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gad
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 09 05:10:02 PST 2003
>Closed-Date:    Mon Jan 27 17:26:45 PST 2003
>Last-Modified:  Mon Jan 27 17:32:20 PST 2003
>Originator:     Fernando Schapachnik
>Release:        FreeBSD 4.7-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD bal740r0.mecon.gov.ar 4.7-RELEASE-p3 FreeBSD 4.7-RELEASE-p3 #2: Mon Jan 6 15:33:54 ART 2003 root@bal740r0.mecon.gov.ar:/usr/obj/usr/src/sys/BAL740R0 i386



>Description:

passwd(5) puts very 'soft' restrictions on the user name:

     The login name must never begin with a hyphen (`-'); also, it is strongly
     suggested that neither upper-case characters nor dots (`.') be part of
     the name, as this tends to confuse mailers.

So it should be safe to pw user add user$, although you get:

     pw: invalid character `$' in field

Usernames ending in $ are needed in some SAMBA setups (machine names).

>How-To-Repeat:

	pw user add user$

>Fix:



	Really simple, just change the right flag in a few places.

--- pw_user.c	Tue Dec  3 09:12:12 2002
+++ /tmp/pw/pw_user.c	Thu Jan  9 09:57:16 2003
@@ -293,7 +293,7 @@
 	}
 
 	if ((a_name = getarg(args, 'n')) != NULL)
-		pwd = GETPWNAM(pw_checkname((u_char *)a_name->val, 0));
+		pwd = GETPWNAM(pw_checkname((u_char *)a_name->val, 1));
 	a_uid = getarg(args, 'u');
 
 	if (a_uid == NULL) {
@@ -455,7 +455,7 @@
 		if ((arg = getarg(args, 'l')) != NULL) {
 			if (strcmp(pwd->pw_name, "root") == 0)
 				errx(EX_DATAERR, "can't rename `root' account");
-			pwd->pw_name = pw_checkname((u_char *)arg->val, 0);
+			pwd->pw_name = pw_checkname((u_char *)arg->val, 1);
 			edited = 1;
 		}
 
--- pw_group.c	Wed Jun 28 16:19:04 2000
+++ /tmp/pw/pw_group.c	Thu Jan  9 09:56:35 2003
@@ -135,7 +135,7 @@
 			grp->gr_gid = (gid_t) atoi(a_gid->val);
 
 		if ((arg = getarg(args, 'l')) != NULL)
-			grp->gr_name = pw_checkname((u_char *)arg->val, 0);
+			grp->gr_name = pw_checkname((u_char *)arg->val, 1);
 	} else {
 		if (a_name == NULL)	/* Required */
 			errx(EX_DATAERR, "group name required");
@@ -145,7 +145,7 @@
 		extendarray(&members, &grmembers, 200);
 		members[0] = NULL;
 		grp = &fakegroup;
-		grp->gr_name = pw_checkname((u_char *)a_name->val, 0);
+		grp->gr_name = pw_checkname((u_char *)a_name->val, 1);
 		grp->gr_passwd = "*";
 		grp->gr_gid = gr_gidpolicy(cnf, args);
 		grp->gr_mem = members;


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: gad 
State-Changed-When: Mon Jan 27 17:23:25 PST 2003 
State-Changed-Why:  
I commited a change to pw_user.c in current which will allow the '$' 
character as the last character in a user or group name.  This will 
address the problem that affects samba.  The patch supplied in this 
PR would have been a bad idea, as the list of valid characters for 
a userid or group name is definitely different than the list of valid 
characters allowed in a gecos field.  Perhaps the man page should be 
more explicit about those restrictions, but in any case samba users 
should be OK now. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=46890 
Responsible-Changed-From-To: freebsd-bugs->gad 
Responsible-Changed-By: gad 
Responsible-Changed-When: Mon Jan 27 17:31:55 PST 2003 
Responsible-Changed-Why:  
I have committed a change to freebsd-current for this issue. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=46890 
>Unformatted:
