summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2007-06-04 04:27:09 +0000
committerBrian Cameron <bcameron@src.gnome.org>2007-06-04 04:27:09 +0000
commit3ba50766948876a58deeff78b9de6fa88da59f23 (patch)
treee055d078c5b4d3516f1369f22bc4654f26d0407b
parentb8be2e86b575acefd6ec2c53a2e1c74431238141 (diff)
downloadgdm-3ba50766948876a58deeff78b9de6fa88da59f23.tar.gz
Prune users out of the user list if their shell is /sbin/nologin,
2007-06-04 Brian Cameron <brian.cameron@sun.com> * gui/gdmuser.c: Prune users out of the user list if their shell is /sbin/nologin, /bin/true, or /bin/false. Patch by Ray Strode <rstrode@redhat.com>. Fixes bug #438682. svn path=/trunk/; revision=4953
-rw-r--r--ChangeLog6
-rw-r--r--gui/gdmuser.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a286d01..aeb28d3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-06-04 Brian Cameron <brian.cameron@sun.com>
+ * gui/gdmuser.c: Prune users out of the user list if their
+ shell is /sbin/nologin, /bin/true, or /bin/false. Patch
+ by Ray Strode <rstrode@redhat.com>. Fixes bug #438682.
+
+2007-06-04 Brian Cameron <brian.cameron@sun.com>
+
* gui/gdmlogin.c, gui/greeter/greeter_item_pam.c: No longer
accept Tab as Enter, backing out fix for bug #127339. For
a11y purposes, it is better to be able to let users navigate
diff --git a/gui/gdmuser.c b/gui/gdmuser.c
index 8a457a24..cca419b3 100644
--- a/gui/gdmuser.c
+++ b/gui/gdmuser.c
@@ -210,6 +210,12 @@ gdm_check_shell (const gchar *usersh)
gint found = 0;
gchar *csh;
+ if (strcmp (usersh, "/sbin/nologin") == 0 ||
+ strcmp (usersh, "/bin/true") == 0 ||
+ strcmp (usersh, "/bin/false") == 0) {
+ return 0;
+ }
+
setusershell ();
while ((csh = getusershell ()) != NULL)