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, 8 insertions, 3 deletions
diff --git a/noncore/settings/usermanager/passwd.cpp b/noncore/settings/usermanager/passwd.cpp index 1e98778..f8e6d17 100644 --- a/noncore/settings/usermanager/passwd.cpp +++ b/noncore/settings/usermanager/passwd.cpp | |||
@@ -198,28 +198,33 @@ bool Passwd::delUser(const char *username, bool delGroup) { | |||
198 | // Delete a user by uid, and optionally also delete group. | 198 | // Delete a user by uid, and optionally also delete group. |
199 | bool Passwd::delUser(int uid, bool delGroup) { | 199 | bool Passwd::delUser(int uid, bool delGroup) { |
200 | QRegExp userRegExp(QString(":%1\\:").arg(uid)); | 200 | QRegExp userRegExp(QString(":%1\\:").arg(uid)); |
201 | return deleteUser(userRegExp,delGroup); | 201 | return deleteUser(userRegExp,delGroup); |
202 | } | 202 | } |
203 | 203 | ||
204 | // Locate a group in the groupStringList, fill out the gr_* variables and return "true" if found. | 204 | // Locate a group in the groupStringList, fill out the gr_* variables and return "true" if found. |
205 | bool Passwd::searchGroup(QRegExp &groupRegExp) { | 205 | bool Passwd::searchGroup(QRegExp &groupRegExp) { |
206 | QStringList tempStringList(groupStringList.grep(groupRegExp)); | 206 | QStringList tempStringList(groupStringList.grep(groupRegExp)); |
207 | if((tempStringList.isEmpty())) { | 207 | if((tempStringList.isEmpty())) { |
208 | return false; | 208 | return false; |
209 | } else { | 209 | } else { |
210 | groupString=(*(tempStringList.begin())); | 210 | for(QStringList::Iterator it=tempStringList.begin(); it!=tempStringList.end(); it++) { |
211 | splitGroupEntry(groupString); | 211 | groupString=*it; |
212 | if(!groupString.find(QRegExp("^#"),0)) {// Skip commented lines. | ||
213 | splitGroupEntry(groupString); | ||
214 | return true; | ||
215 | } | ||
216 | } | ||
212 | } | 217 | } |
213 | return true; | 218 | return false; |
214 | } | 219 | } |
215 | 220 | ||
216 | // Find a group by groupname. | 221 | // Find a group by groupname. |
217 | bool Passwd::findGroup(const char *groupname) { | 222 | bool Passwd::findGroup(const char *groupname) { |
218 | QRegExp groupRegExp(QString("^%1\\:").arg(groupname)); | 223 | QRegExp groupRegExp(QString("^%1\\:").arg(groupname)); |
219 | return searchGroup(groupRegExp); | 224 | return searchGroup(groupRegExp); |
220 | } | 225 | } |
221 | 226 | ||
222 | // Find a group by gid. | 227 | // Find a group by gid. |
223 | bool Passwd::findGroup(int gid) { | 228 | bool Passwd::findGroup(int gid) { |
224 | QRegExp groupRegExp(QString(":%1\\:").arg(gid)); | 229 | QRegExp groupRegExp(QString(":%1\\:").arg(gid)); |
225 | return searchGroup(groupRegExp); | 230 | return searchGroup(groupRegExp); |