gdm r5743 - in trunk: . daemon

[halfline svn gnome org]

Author: halfline
Date: Sat Feb  9 03:56:36 2008
New Revision: 5743
URL: http://svn.gnome.org/viewvc/gdm?rev=5743&view=rev

Log:
2008-02-08  Ray Strode  <rstrode redhat com>

	* daemon/gdm-session-worker.c
	(gdm_session_worker_update_username):
	report to auditor username even if it doesn't
	change over the course of the pam conversation


Modified:
   trunk/ChangeLog
   trunk/daemon/gdm-session-auditor.c
   trunk/daemon/gdm-session-linux-auditor.c
   trunk/daemon/gdm-session-worker.c

Modified: trunk/daemon/gdm-session-auditor.c
==============================================================================
--- trunk/daemon/gdm-session-auditor.c	(original)
+++ trunk/daemon/gdm-session-auditor.c	Sat Feb  9 03:56:36 2008
@@ -145,6 +145,7 @@
 
         if ((username == NULL || auditor->priv->username == NULL) ||
             strcmp (username, auditor->priv->username) != 0) {
+                g_debug ("reporting to auditor username has been set to '%s'\n", username);
                 auditor->priv->username = g_strdup (username);
                 g_object_notify (G_OBJECT (auditor), "username");
         }
@@ -257,6 +258,7 @@
 void
 gdm_session_auditor_report_password_changed (GdmSessionAuditor *auditor)
 {
+        g_debug ("report password changed %s\n", auditor->priv->username);
         if (GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_password_changed != NULL) {
                 GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_password_changed (auditor);
         }
@@ -265,6 +267,7 @@
 void
 gdm_session_auditor_report_password_change_failure (GdmSessionAuditor *auditor)
 {
+        g_debug ("report password change failure %s\n", auditor->priv->username);
         if (GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_password_change_failure != NULL) {
                 GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_password_change_failure (auditor);
         }
@@ -273,6 +276,7 @@
 void
 gdm_session_auditor_report_user_accredited (GdmSessionAuditor *auditor)
 {
+        g_debug ("report user accredited %s\n", auditor->priv->username);
         if (GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_user_accredited != NULL) {
                 GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_user_accredited (auditor);
         }
@@ -281,6 +285,8 @@
 void
 gdm_session_auditor_report_login (GdmSessionAuditor *auditor)
 {
+
+        g_debug ("report login %s\n", auditor->priv->username);
         if (GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_login != NULL) {
                 GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_login (auditor);
         }
@@ -291,6 +297,7 @@
                                           int                error_code,
                                           const char        *error_message)
 {
+        g_debug ("report login failure %s\n", auditor->priv->username);
         if (GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_login_failure != NULL) {
                 GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_login_failure (auditor, error_code, error_message);
         }
@@ -299,6 +306,7 @@
 void
 gdm_session_auditor_report_logout (GdmSessionAuditor *auditor)
 {
+        g_debug ("report logout %s\n", auditor->priv->username);
         if (GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_logout != NULL) {
                 GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_logout (auditor);
         }

Modified: trunk/daemon/gdm-session-linux-auditor.c
==============================================================================
--- trunk/daemon/gdm-session-linux-auditor.c	(original)
+++ trunk/daemon/gdm-session-linux-auditor.c	Sat Feb  9 03:56:36 2008
@@ -64,6 +64,7 @@
         if (username != NULL) {
                 pw = getpwnam (username);
         } else {
+                G_BREAKPOINT ();
                 username = g_strdup ("unknown");
                 pw = NULL;
         }

Modified: trunk/daemon/gdm-session-worker.c
==============================================================================
--- trunk/daemon/gdm-session-worker.c	(original)
+++ trunk/daemon/gdm-session-worker.c	Sat Feb  9 03:56:36 2008
@@ -495,6 +495,8 @@
                          username != NULL ? username : "<unset>",
                          worker->priv->username != NULL ? worker->priv->username : "<unset>");
 
+                gdm_session_auditor_set_username (worker->priv->auditor, worker->priv->username);
+
                 if ((worker->priv->username == username) ||
                     ((worker->priv->username != NULL) && (username != NULL) &&
                      (strcmp (worker->priv->username, username) == 0)))
@@ -506,8 +508,6 @@
                 worker->priv->username = username;
                 username = NULL;
 
-                gdm_session_auditor_set_username (worker->priv->auditor, worker->priv->username);
-
                 send_dbus_string_method (worker->priv->connection,
                                          "UsernameChanged",
                                          worker->priv->username);