author | umopapisdn <umopapisdn> | 2003-03-28 13:12:09 (UTC) |
---|---|---|
committer | umopapisdn <umopapisdn> | 2003-03-28 13:12:09 (UTC) |
commit | b271d575fa05cf570a1a829136517761bd47e69b (patch) (unidiff) | |
tree | e82c8e348b3b926fb365c42454d12a56dda0adc6 /noncore | |
parent | 8e8803488d2c11b12449e785802da4a5a9adad0f (diff) | |
download | opie-b271d575fa05cf570a1a829136517761bd47e69b.zip opie-b271d575fa05cf570a1a829136517761bd47e69b.tar.gz opie-b271d575fa05cf570a1a829136517761bd47e69b.tar.bz2 |
Bugfix: (bug #0000765) Lines in /etc/passwd & /etc/group starting with a "#" are comments and should not be editable.
-rw-r--r-- | noncore/settings/usermanager/opie-usermanager.control | 2 | ||||
-rw-r--r-- | noncore/settings/usermanager/passwd.cpp | 11 | ||||
-rw-r--r-- | noncore/settings/usermanager/userdialog.cpp | 6 | ||||
-rw-r--r-- | noncore/settings/usermanager/usermanager.cpp | 26 |
4 files changed, 28 insertions, 17 deletions
diff --git a/noncore/settings/usermanager/opie-usermanager.control b/noncore/settings/usermanager/opie-usermanager.control index f971fdc..e1c7762 100644 --- a/noncore/settings/usermanager/opie-usermanager.control +++ b/noncore/settings/usermanager/opie-usermanager.control | |||
@@ -5,5 +5,5 @@ Version: $QPE_VERSION-$SUB_VERSION | |||
5 | Depends: opie-base | 5 | Depends: opie-base |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Maintainer: Ted Parnefors <zaurus@bredband.net> | 7 | Maintainer: Ted Parnefors <zaurus@bredband.net> |
8 | License: GPL | 8 | License: GPL |
9 | Description: User/Group manager for OPIE. | 9 | Description: User/Group manager for Opie. |
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 | |||
@@ -206,12 +206,17 @@ 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) { |
diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp index 0d2122b..c06f639 100644 --- a/noncore/settings/usermanager/userdialog.cpp +++ b/noncore/settings/usermanager/userdialog.cpp | |||
@@ -43,10 +43,12 @@ UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool mod | |||
43 | accounts->groupStringList.sort(); | 43 | accounts->groupStringList.sort(); |
44 | // And also fill the listview & the combobox with all available groups. | 44 | // And also fill the listview & the combobox with all available groups. |
45 | for( QStringList::Iterator it = accounts->groupStringList.begin(); it!=accounts->groupStringList.end(); ++it) { | 45 | for( QStringList::Iterator it = accounts->groupStringList.begin(); it!=accounts->groupStringList.end(); ++it) { |
46 | accounts->splitGroupEntry(*it); | 46 | accounts->splitGroupEntry(*it); |
47 | new QCheckListItem(groupsListView,accounts->gr_name,QCheckListItem::CheckBox); | 47 | if(accounts->gr_name.find(QRegExp("^#"),0)) {// Skip commented lines. |
48 | groupComboBox->insertItem(accounts->gr_name); | 48 | new QCheckListItem(groupsListView,accounts->gr_name,QCheckListItem::CheckBox); |
49 | groupComboBox->insertItem(accounts->gr_name); | ||
50 | } | ||
49 | } | 51 | } |
50 | showMaximized(); | 52 | showMaximized(); |
51 | } | 53 | } |
52 | 54 | ||
diff --git a/noncore/settings/usermanager/usermanager.cpp b/noncore/settings/usermanager/usermanager.cpp index 57efa71..1946013 100644 --- a/noncore/settings/usermanager/usermanager.cpp +++ b/noncore/settings/usermanager/usermanager.cpp | |||
@@ -125,18 +125,20 @@ void UserConfig::getUsers() { | |||
125 | // availableUID is used as a deposite for the next available UID on the system, this should start at an ID over 500. | 125 | // availableUID is used as a deposite for the next available UID on the system, this should start at an ID over 500. |
126 | availableUID=500; | 126 | availableUID=500; |
127 | for(QStringList::Iterator it=accounts->passwdStringList.begin(); it!=accounts->passwdStringList.end(); ++it) { | 127 | for(QStringList::Iterator it=accounts->passwdStringList.begin(); it!=accounts->passwdStringList.end(); ++it) { |
128 | accounts->splitPasswdEntry(*it); // Split the string into it's components and store in variables in the accounts object. ("pr_name" and so on.) | 128 | accounts->splitPasswdEntry(*it); // Split the string into it's components and store in variables in the accounts object. ("pr_name" and so on.) |
129 | new QListViewItem(usersListView,QString::number(accounts->pw_uid),accounts->pw_name,accounts->pw_gecos); | 129 | if(accounts->pw_name.find(QRegExp("^#"),0)) {// Skip commented lines. |
130 | if((accounts->pw_uid>=500) && (accounts->pw_uid<65000)) {// Is this user a "normal" user ? | 130 | new QListViewItem(usersListView,QString::number(accounts->pw_uid),accounts->pw_name,accounts->pw_gecos); |
131 | mytext=QString(accounts->pw_name)+" - ("+QString(accounts->pw_gecos)+")"; // The string displayed next to the icon. | 131 | if((accounts->pw_uid>=500) && (accounts->pw_uid<65000)) {// Is this user a "normal" user ? |
132 | if(!(mypixmap.load("/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png"))) { // Is there an icon for this user? Resource::loadPixmap is caching, doesn't work. | 132 | mytext=QString(accounts->pw_name)+" - ("+QString(accounts->pw_gecos)+")"; // The string displayed next to the icon. |
133 | mypixmap=Resource::loadPixmap(QString("usermanager/usericon"));// If this user has no icon, load the default icon. | 133 | if(!(mypixmap.load("/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png"))) { // Is there an icon for this user? Resource::loadPixmap is caching, doesn't work. |
134 | mypixmap=Resource::loadPixmap(QString("usermanager/usericon"));// If this user has no icon, load the default icon. | ||
135 | } | ||
136 | listviewitem=new QListViewItem(usersIconView,"",mytext);// Add the icon+text to the qiconview. | ||
137 | listviewitem->setPixmap(0,mypixmap); | ||
134 | } | 138 | } |
135 | listviewitem=new QListViewItem(usersIconView,"",mytext);// Add the icon+text to the qiconview. | 139 | if((accounts->pw_uid>=availableUID) && (accounts->pw_uid<65000)) availableUID=accounts->pw_uid+1; // Increase 1 to the latest know UID to get a free uid. |
136 | listviewitem->setPixmap(0,mypixmap); | ||
137 | } | 140 | } |
138 | if((accounts->pw_uid>=availableUID) && (accounts->pw_uid<65000)) availableUID=accounts->pw_uid+1; // Increase 1 to the latest know UID to get a free uid. | ||
139 | } | 141 | } |
140 | usersIconView->sort(); | 142 | usersIconView->sort(); |
141 | } | 143 | } |
142 | 144 | ||
@@ -215,12 +217,14 @@ void UserConfig::getGroups() { | |||
215 | groupsListView->clear();// Empty the listview. | 217 | groupsListView->clear();// Empty the listview. |
216 | availableGID=500;// We need to find the next free GID, and are only interested in values between 500 & 65000. | 218 | availableGID=500;// We need to find the next free GID, and are only interested in values between 500 & 65000. |
217 | for(QStringList::Iterator it=accounts->groupStringList.begin(); it!=accounts->groupStringList.end(); ++it) {// Split the list into lines. | 219 | for(QStringList::Iterator it=accounts->groupStringList.begin(); it!=accounts->groupStringList.end(); ++it) {// Split the list into lines. |
218 | accounts->splitGroupEntry(*it);// Split the line into its components and fill the variables of 'accounts'. (gr_name, gr_uid & gr_mem). | 220 | accounts->splitGroupEntry(*it);// Split the line into its components and fill the variables of 'accounts'. (gr_name, gr_uid & gr_mem). |
219 | new QListViewItem(groupsListView,QString::number(accounts->gr_gid),accounts->gr_name); | 221 | if(accounts->gr_name.find(QRegExp("^#"),0)) {// Skip commented lines. |
220 | if((accounts->gr_gid>=availableGID) && (accounts->gr_gid<65000)) availableGID=accounts->gr_gid+1;// Maybe a new free GID. | 222 | new QListViewItem(groupsListView,QString::number(accounts->gr_gid),accounts->gr_name); |
223 | if((accounts->gr_gid>=availableGID) && (accounts->gr_gid<65000)) availableGID=accounts->gr_gid+1;// Maybe a new free GID. | ||
224 | } | ||
221 | } | 225 | } |
222 | } | 226 | } |
223 | 227 | ||
224 | void UserConfig::addGroup() { | 228 | void UserConfig::addGroup() { |
225 | if(GroupDialog::addGroup(availableGID)) getGroups();// Bring up the add group dialog. | 229 | if(GroupDialog::addGroup(availableGID)) getGroups();// Bring up the add group dialog. |
226 | } | 230 | } |