Diffstat (limited to 'noncore/settings/usermanager/passwd.cpp') (more/less context) (ignore 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 @@ -122,3 +122,3 @@ void Passwd::splitGroupEntry(QString &groupString) { gr_gid=(*it++).toInt(); - gr_mem=QStringList::split(" ",(*it++)); + gr_mem=QStringList::split(",",(*it++)); } @@ -241,5 +241,6 @@ bool Passwd::updateGroup(int gid) { *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+=","; } @@ -277,3 +278,5 @@ 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; |