diff options
author | Ray Strode <rstrode@redhat.com> | 2015-01-29 16:54:37 -0500 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2015-02-16 23:36:02 -0500 |
commit | 83fcbd434c64d7fa4ae5d174646e6bbcc263791b (patch) | |
tree | a381413226c66a8f003fef681a71d54a3a0b6314 | |
parent | e0e862616db466f4372b891aa549e5ba5d29299e (diff) | |
download | gdm-83fcbd434c64d7fa4ae5d174646e6bbcc263791b.tar.gz |
slave: drop some dead code
-rw-r--r-- | daemon/gdm-simple-slave.c | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 63099e50..4f0bf3d6 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -67,18 +67,12 @@ struct GdmSimpleSlavePrivate { GPid pid; char *username; - gint greeter_reset_id; int ping_interval; - GPid server_pid; guint connection_attempts; GdmServer *server; - -#ifdef HAVE_LOGINDEVPERM - gboolean use_logindevperm; -#endif }; enum { @@ -91,73 +85,6 @@ static void gdm_simple_slave_finalize (GObject *object); G_DEFINE_TYPE (GdmSimpleSlave, gdm_simple_slave, GDM_TYPE_SLAVE) -#ifdef HAVE_LOGINDEVPERM -static void -gdm_simple_slave_grant_console_permissions (GdmSimpleSlave *slave) -{ - const char *username; - const char *display_device; - struct passwd *passwd_entry; - - username = gdm_session_get_username (slave->priv->session); - display_device = gdm_session_get_display_device (slave->priv->session); - - if (username != NULL) { - gdm_get_pwent_for_name (username, &passwd_entry); - - /* - * Only do logindevperm processing if /dev/console or - * a device associated with a VT - */ - if (display_device != NULL && - (strncmp (display_device, "/dev/vt/", strlen ("/dev/vt/")) == 0 || - strcmp (display_device, "/dev/console") == 0)) { - g_debug ("Logindevperm login for user %s, device %s", - username, display_device); - (void) di_devperm_login (display_device, - passwd_entry->pw_uid, - passwd_entry->pw_gid, - NULL); - slave->priv->use_logindevperm = TRUE; - } - } - - if (!slave->priv->use_logindevperm) { - g_debug ("Not calling di_devperm_login login for user %s, device %s", - username, display_device); - } -} - -static void -gdm_simple_slave_revoke_console_permissions (GdmSimpleSlave *slave) -{ - const char *username; - const char *display_device; - - username = gdm_session_get_username (slave->priv->session); - display_device = gdm_session_get_display_device (slave->priv->session); - - /* - * Only do logindevperm processing if /dev/console or a device - * associated with a VT. Do this after processing the PostSession - * script so that permissions for devices are not returned to root - * before running the script. - */ - if (slave->priv->use_logindevperm == TRUE && - display_device != NULL && - (strncmp (display_device, "/dev/vt/", strlen ("/dev/vt/")) == 0 || - strcmp (display_device, "/dev/console") == 0)) { - g_debug ("di_devperm_logout for user %s, device %s", - username, display_device); - (void) di_devperm_logout (display_device); - slave->priv->use_logindevperm = FALSE; - } else { - g_debug ("Not calling di_devperm_logout logout for user %s, device %s", - username, display_device); - } -} -#endif /* HAVE_LOGINDEVPERM */ - static void setup_server (GdmSimpleSlave *slave) { @@ -344,10 +271,5 @@ gdm_simple_slave_finalize (GObject *object) g_return_if_fail (slave->priv != NULL); - if (slave->priv->greeter_reset_id > 0) { - g_source_remove (slave->priv->greeter_reset_id); - slave->priv->greeter_reset_id = 0; - } - G_OBJECT_CLASS (gdm_simple_slave_parent_class)->finalize (object); } |