author | umopapisdn <umopapisdn> | 2003-03-22 00:31:44 (UTC) |
---|---|---|
committer | umopapisdn <umopapisdn> | 2003-03-22 00:31:44 (UTC) |
commit | ebf65f250904e0619c10b69a0428fcc538ffc167 (patch) (side-by-side diff) | |
tree | 1ed0ca90ff564a55116787acff758cb2e4dcb4f8 /noncore/settings/usermanager/passwd.cpp | |
parent | ab8cb739c666f5f22049258a4bcbb06d1e1ad0c4 (diff) | |
download | opie-ebf65f250904e0619c10b69a0428fcc538ffc167.zip opie-ebf65f250904e0619c10b69a0428fcc538ffc167.tar.gz opie-ebf65f250904e0619c10b69a0428fcc538ffc167.tar.bz2 |
Bugfix: Groupmembers should be separated by a comma and not by a space.
Diffstat (limited to 'noncore/settings/usermanager/passwd.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/usermanager/passwd.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/noncore/settings/usermanager/passwd.cpp b/noncore/settings/usermanager/passwd.cpp index 0a2bfba..1e98778 100644 --- a/noncore/settings/usermanager/passwd.cpp +++ b/noncore/settings/usermanager/passwd.cpp @@ -120,7 +120,7 @@ void Passwd::splitGroupEntry(QString &groupString) { gr_name=(*it++); it++; gr_gid=(*it++).toInt(); - gr_mem=QStringList::split(" ",(*it++)); + gr_mem=QStringList::split(",",(*it++)); } // Find a user in the passwdStringList. Return true if found and also fill the pw_* variables. @@ -239,9 +239,10 @@ bool Passwd::updateGroup(int gid) { for(QStringList::Iterator it=groupStringList.begin(); it!=groupStringList.end(); ++it) { if(groupRegExp.find((*it),0)!=-1) { *it=QString(gr_name+":*:"+QString::number(gr_gid)+":"); - for(QStringList::Iterator member=gr_mem.begin(); member!=gr_mem.end(); ++member) { + for(QStringList::Iterator member=gr_mem.begin(); member!=gr_mem.end();) { *it+=*member; - *it+=" "; + ++member; + if(member!=gr_mem.end()) *it+=","; } return true; } @@ -275,7 +276,9 @@ bool Passwd::delGroup(int gid) { // Add a user as a member to a group in groupStringList. bool Passwd::addGroupMember(QString groupname, QString member) { if(!(findGroup(groupname))) return false; - gr_mem << member; + QRegExp memberRegExp(QString("^%1$").arg(member)); + QStringList templist=gr_mem.grep(memberRegExp); + if(templist.isEmpty()) gr_mem << member; if(!(updateGroup(gr_gid))) return false; return true; } |