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 | |||
@@ -117,13 +117,13 @@ void Passwd::splitPasswdEntry(QString &userString) { | |||
117 | void Passwd::splitGroupEntry(QString &groupString) { | 117 | void Passwd::splitGroupEntry(QString &groupString) { |
118 | groupdataStringList=QStringList::split(":",groupString,true); | 118 | groupdataStringList=QStringList::split(":",groupString,true); |
119 | QStringList::Iterator it=groupdataStringList.begin(); | 119 | QStringList::Iterator it=groupdataStringList.begin(); |
120 | gr_name=(*it++); | 120 | gr_name=(*it++); |
121 | it++; | 121 | it++; |
122 | gr_gid=(*it++).toInt(); | 122 | gr_gid=(*it++).toInt(); |
123 | gr_mem=QStringList::split(" ",(*it++)); | 123 | gr_mem=QStringList::split(",",(*it++)); |
124 | } | 124 | } |
125 | 125 | ||
126 | // Find a user in the passwdStringList. Return true if found and also fill the pw_* variables. | 126 | // Find a user in the passwdStringList. Return true if found and also fill the pw_* variables. |
127 | bool Passwd::searchUser(QRegExp &userRegExp) { | 127 | bool Passwd::searchUser(QRegExp &userRegExp) { |
128 | QStringList tempStringList(passwdStringList.grep(userRegExp)); | 128 | QStringList tempStringList(passwdStringList.grep(userRegExp)); |
129 | if((tempStringList.isEmpty())) { | 129 | if((tempStringList.isEmpty())) { |
@@ -236,15 +236,16 @@ bool Passwd::addGroup(QString gr_name, int gr_gid) { | |||
236 | // Update fields for a group in groupStringList, take info from the gr_* variables. | 236 | // Update fields for a group in groupStringList, take info from the gr_* variables. |
237 | bool Passwd::updateGroup(int gid) { | 237 | bool Passwd::updateGroup(int gid) { |
238 | QRegExp groupRegExp(QString(":%1\\:").arg(QString::number(gid))); | 238 | QRegExp groupRegExp(QString(":%1\\:").arg(QString::number(gid))); |
239 | for(QStringList::Iterator it=groupStringList.begin(); it!=groupStringList.end(); ++it) { | 239 | for(QStringList::Iterator it=groupStringList.begin(); it!=groupStringList.end(); ++it) { |
240 | if(groupRegExp.find((*it),0)!=-1) { | 240 | if(groupRegExp.find((*it),0)!=-1) { |
241 | *it=QString(gr_name+":*:"+QString::number(gr_gid)+":"); | 241 | *it=QString(gr_name+":*:"+QString::number(gr_gid)+":"); |
242 | for(QStringList::Iterator member=gr_mem.begin(); member!=gr_mem.end(); ++member) { | 242 | for(QStringList::Iterator member=gr_mem.begin(); member!=gr_mem.end();) { |
243 | *it+=*member; | 243 | *it+=*member; |
244 | *it+=" "; | 244 | ++member; |
245 | if(member!=gr_mem.end()) *it+=","; | ||
245 | } | 246 | } |
246 | return true; | 247 | return true; |
247 | } | 248 | } |
248 | } | 249 | } |
249 | return false; | 250 | return false; |
250 | } | 251 | } |
@@ -272,13 +273,15 @@ bool Passwd::delGroup(int gid) { | |||
272 | return deleteGroup(groupRegExp); | 273 | return deleteGroup(groupRegExp); |
273 | } | 274 | } |
274 | 275 | ||
275 | // Add a user as a member to a group in groupStringList. | 276 | // Add a user as a member to a group in groupStringList. |
276 | bool Passwd::addGroupMember(QString groupname, QString member) { | 277 | bool Passwd::addGroupMember(QString groupname, QString member) { |
277 | if(!(findGroup(groupname))) return false; | 278 | if(!(findGroup(groupname))) return false; |
278 | gr_mem << member; | 279 | QRegExp memberRegExp(QString("^%1$").arg(member)); |
280 | QStringList templist=gr_mem.grep(memberRegExp); | ||
281 | if(templist.isEmpty()) gr_mem << member; | ||
279 | if(!(updateGroup(gr_gid))) return false; | 282 | if(!(updateGroup(gr_gid))) return false; |
280 | return true; | 283 | return true; |
281 | } | 284 | } |
282 | 285 | ||
283 | // Delete a user as a groupmember from a group in groupStringList. | 286 | // Delete a user as a groupmember from a group in groupStringList. |
284 | bool Passwd::delGroupMember(QString groupname, QString member) { | 287 | bool Passwd::delGroupMember(QString groupname, QString member) { |