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 9117a23614e6ae4f5b257742514049f1f7e5de0e..e433ea1313a9766cc04ede82a3186088850af9eb 100644 (file)
--- 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