[gdm/gnome-3-16] session-record: support NULL display name if tty available (for logout/failed)



commit a48ea6c5fa682ef1c83662da6a813f7b2486c551
Author: Ray Strode <rstrode redhat com>
Date:   Thu Apr 2 11:33:20 2015 -0400

    session-record: support NULL display name if tty available (for logout/failed)
    
    wayland sessions don't necessarily have a display name, so this
    commit just uses the display device instead.
    
    It's like commit 1edb0e4ae897cb1c53af3f3b2b913d5baf731580 but for
    logout and failed records.
    
    Discovered by Sinclair Yeh <syeh vmware com>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=749404

 daemon/gdm-session-record.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/daemon/gdm-session-record.c b/daemon/gdm-session-record.c
index da824aa..3323252 100644
--- a/daemon/gdm-session-record.c
+++ b/daemon/gdm-session-record.c
@@ -279,6 +279,9 @@ gdm_session_record_logout (GPid                  session_pid,
         UTMP        session_record = { 0 };
         UTMP       *u;
 
+        if (x11_display_name == NULL)
+                x11_display_name = display_device;
+
         g_debug ("Writing logout record");
 
 #if defined(HAVE_UT_UT_TYPE)
@@ -350,6 +353,9 @@ gdm_session_record_failed (GPid                  session_pid,
 {
         UTMP        session_record = { 0 };
 
+        if (x11_display_name == NULL)
+                x11_display_name = display_device;
+
         record_set_username (&session_record, user_name);
 
         g_debug ("Writing failed session attempt record");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]