From: Frederic Marchal <fmarchal@users.sourceforge.net>
Date: Fri, 4 Jan 2013 19:08:13 +0000 (+0100)
Subject: Mangled file name is really unique
X-Git-Tag: v2.3.4~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8217e6e55c12799472483b7736236b50a01f2089;p=thirdparty%2Fsarg.git

Mangled file name is really unique

Due to a bug, any user's ID containing at least two consecutive non
alphanumeric characters was not unique.
---

diff --git a/userinfo.c b/userinfo.c
index 9117a23..e433ea1 100644
--- a/userinfo.c
+++ b/userinfo.c
@@ -108,15 +108,15 @@ struct userinfostruct *userinfo_create(const char *userid)
 			}
 		}
 		if (j==0) user->filename[j++]='_'; //don't leave a file name empty
+		flen=j;
 		user->filename[j]='\0';
-		flen=i-1;
 
 		count=0;
 		for (group=first_user_group ; group ; group=group->next) {
 			lastuser=(group->next) ? group->nusers : group->nusers-1;
 			for (i=0 ; i<lastuser ; i++) {
 				if (strcasecmp(user->filename,group->list[i].filename)==0) {
-					clen=sprintf(cstr,"-%04X",count++);
+					clen=sprintf(cstr,"+%X",count++);
 					if (flen+clen<MAX_USER_FNAME_LEN)
 						strcpy(user->filename+flen,cstr);
 					else