gdm r6324 - in trunk: . daemon

[mccann svn gnome org]

Author: mccann
Date: Tue Jul 22 02:03:29 2008
New Revision: 6324
URL: http://svn.gnome.org/viewvc/gdm?rev=6324&view=rev

Log:
2008-07-21  William Jon McCann  <jmccann redhat com>

	* daemon/gdm-slave.c (gdm_slave_run_script):
	Fix check for /etc/gdm/Init/Default so it will
	actually be executed.



Modified:
   trunk/ChangeLog
   trunk/daemon/gdm-slave.c

Modified: trunk/daemon/gdm-slave.c
==============================================================================
--- trunk/daemon/gdm-slave.c	(original)
+++ trunk/daemon/gdm-slave.c	Tue Jul 22 02:03:29 2008
@@ -258,44 +258,32 @@
         g_assert (login != NULL);
 
         script = g_build_filename (dir, slave->priv->display_name, NULL);
-        if (g_access (script, R_OK | X_OK) != 0) {
+        g_debug ("GdmSlave: Trying script %s", script);
+        if (g_file_test (script, G_FILE_TEST_IS_REGULAR)
+            && g_file_test (script, G_FILE_TEST_IS_EXECUTABLE)) {
                 g_debug ("GdmSlave: script %s not found; skipping", script);
                 g_free (script);
                 script = NULL;
         }
 
-        if (script == NULL &&
-            slave->priv->display_hostname != NULL) {
+        if (script == NULL
+            && slave->priv->display_hostname != NULL
+            && slave->priv->display_hostname[0] != '\0') {
                 script = g_build_filename (dir, slave->priv->display_hostname, NULL);
-                if (g_access (script, R_OK | X_OK) != 0) {
+                g_debug ("GdmSlave: Trying script %s", script);
+                if (g_file_test (script, G_FILE_TEST_IS_REGULAR)
+                    && g_file_test (script, G_FILE_TEST_IS_EXECUTABLE)) {
                         g_debug ("GdmSlave: script %s not found; skipping", script);
                         g_free (script);
                         script = NULL;
                 }
         }
 
-#if 0
-        if (script == NULL &&
-            SERVER_IS_XDMCP (d)) {
-                script = g_build_filename (dir, "XDMCP", NULL);
-                if (g_access (script, R_OK | X_OK) != 0) {
-                        g_free (script);
-                        script = NULL;
-                }
-        }
-        if (script == NULL &&
-            SERVER_IS_FLEXI (d)) {
-                script = g_build_filename (dir, "Flexi", NULL);
-                if (g_access (script, R_OK | X_OK) != 0) {
-                        g_free (script);
-                        script = NULL;
-                }
-        }
-#endif
-
         if (script == NULL) {
                 script = g_build_filename (dir, "Default", NULL);
-                if (g_access (script, R_OK | X_OK) != 0) {
+                g_debug ("GdmSlave: Trying script %s", script);
+                if (g_file_test (script, G_FILE_TEST_IS_REGULAR)
+                    && g_file_test (script, G_FILE_TEST_IS_EXECUTABLE)) {
                         g_debug ("GdmSlave: script %s not found; skipping", script);
                         g_free (script);
                         script = NULL;