diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | daemon/gdm-factory-slave.c | 1 | ||||
| -rw-r--r-- | daemon/gdm-product-slave.c | 1 | ||||
| -rw-r--r-- | daemon/gdm-simple-slave.c | 1 | ||||
| -rw-r--r-- | daemon/gdm-slave.c | 4 | ||||
| -rw-r--r-- | daemon/gdm-xdmcp-chooser-slave.c | 1 | ||||
| -rw-r--r-- | daemon/simple-slave-main.c | 3 |
7 files changed, 22 insertions, 0 deletions
@@ -1,3 +1,14 @@ +2008-02-06 William Jon McCann <jmccann@redhat.com> + + * daemon/gdm-factory-slave.c: (idle_connect_to_display): + * daemon/gdm-product-slave.c: (idle_connect_to_display): + * daemon/gdm-simple-slave.c: (idle_connect_to_display): + * daemon/gdm-slave.c: (gdm_slave_run_script): + * daemon/gdm-xdmcp-chooser-slave.c: (idle_connect_to_display): + * daemon/simple-slave-main.c: (main): + Make sure we retry connecting to the xserver. This also ensures + that we reach the exit if we fail the max number of times. + 2008-02-05 Ray Strode <rstrode@redhat.com> Add PAM auditing logic. Based on patch and feedback from diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c index dc9fbc97..5c69dafb 100644 --- a/daemon/gdm-factory-slave.c +++ b/daemon/gdm-factory-slave.c @@ -574,6 +574,7 @@ idle_connect_to_display (GdmFactorySlave *slave) g_warning ("Unable to connect to display after %d tries - bailing out", slave->priv->connection_attempts); exit (1); } + return TRUE; } return FALSE; diff --git a/daemon/gdm-product-slave.c b/daemon/gdm-product-slave.c index 130a643f..4ac5c427 100644 --- a/daemon/gdm-product-slave.c +++ b/daemon/gdm-product-slave.c @@ -322,6 +322,7 @@ idle_connect_to_display (GdmProductSlave *slave) g_warning ("Unable to connect to display after %d tries - bailing out", slave->priv->connection_attempts); exit (1); } + return TRUE; } return FALSE; diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 0e36ee99..6b0c7509 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -751,6 +751,7 @@ idle_connect_to_display (GdmSimpleSlave *slave) g_warning ("Unable to connect to display after %d tries - bailing out", slave->priv->connection_attempts); exit (1); } + return TRUE; } return FALSE; diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c index 2cae7dcd..ee8fc763 100644 --- a/daemon/gdm-slave.c +++ b/daemon/gdm-slave.c @@ -263,6 +263,7 @@ gdm_slave_run_script (GdmSlave *slave, script = g_build_filename (dir, slave->priv->display_name, NULL); if (g_access (script, R_OK | X_OK) != 0) { + g_debug ("GdmSlave: script %s not found; skipping", script); g_free (script); script = NULL; } @@ -271,6 +272,7 @@ gdm_slave_run_script (GdmSlave *slave, slave->priv->display_hostname != NULL) { script = g_build_filename (dir, slave->priv->display_hostname, NULL); if (g_access (script, R_OK | X_OK) != 0) { + g_debug ("GdmSlave: script %s not found; skipping", script); g_free (script); script = NULL; } @@ -298,12 +300,14 @@ gdm_slave_run_script (GdmSlave *slave, if (script == NULL) { script = g_build_filename (dir, "Default", NULL); if (g_access (script, R_OK | X_OK) != 0) { + g_debug ("GdmSlave: script %s not found; skipping", script); g_free (script); script = NULL; } } if (script == NULL) { + g_debug ("GdmSlave: no script found"); return TRUE; } diff --git a/daemon/gdm-xdmcp-chooser-slave.c b/daemon/gdm-xdmcp-chooser-slave.c index d708208e..b63c0b69 100644 --- a/daemon/gdm-xdmcp-chooser-slave.c +++ b/daemon/gdm-xdmcp-chooser-slave.c @@ -260,6 +260,7 @@ idle_connect_to_display (GdmXdmcpChooserSlave *slave) g_warning ("Unable to connect to display after %d tries - bailing out", slave->priv->connection_attempts); exit (1); } + return TRUE; } return FALSE; diff --git a/daemon/simple-slave-main.c b/daemon/simple-slave-main.c index ffd7dcd7..952b2275 100644 --- a/daemon/simple-slave-main.c +++ b/daemon/simple-slave-main.c @@ -171,6 +171,9 @@ main (int argc, g_option_context_parse (context, &argc, &argv, NULL); g_option_context_free (context); + /* For debugging */ + /*sleep (10);*/ + connection = get_system_bus (); if (connection == NULL) { goto out; |