summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--daemon/gdm-manager.c5
-rw-r--r--daemon/gdm-session-record.c15
2 files changed, 6 insertions, 14 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index 256b6447..c3293d95 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -677,6 +677,11 @@ add_session_record (GdmManager *manager,
display_device = NULL;
username = gdm_session_get_username (session);
+
+ if (username == NULL) {
+ goto out;
+ }
+
g_object_get (G_OBJECT (session),
"display-name", &display_name,
"display-hostname", &hostname,
diff --git a/daemon/gdm-session-record.c b/daemon/gdm-session-record.c
index 32933ef0..487f1004 100644
--- a/daemon/gdm-session-record.c
+++ b/daemon/gdm-session-record.c
@@ -61,21 +61,8 @@
static void
record_set_username (UTMP *u,
- const char *user_name)
+ const char *username)
{
- const char *username;
-
- /*
- * It is possible that PAM failed before it mapped the user
- * input into a valid username, so we fallback to try using
- * "(unknown)"
- */
- if (user_name != NULL) {
- username = user_name;
- } else {
- username = "(unknown)";
- }
-
#if defined(HAVE_UT_UT_USER)
strncpy (u->ut_user,
username,