16880N/A@@ -52,6 +52,8 @@ gboolean gdm_string_hex_decode
16880N/A char *gdm_generate_random_bytes (gsize size,
16880N/A+char *gdm_read_default (gchar *key);
18964N/A@@ -470,3 +471,27 @@ gdm_generate_random_bytes (gsize size
16880N/A+ * interface to control programs that affect security. This is a Solaris
16880N/A+ * thing, though some users on other systems may find it useful.
16880N/A+ int flags = defcntl (DC_GETFLAGS, 0);
16880N/A+ (void) defcntl (DC_SETFLAGS, flags); /* ignore case */
16880N/A+ retval = g_strdup (defread (key));
16880N/A+ (void) defopen ((char *)NULL);
18683N/A@@ -2014,6 +2014,9 @@ gdm_session_direct_set_environment_varia
18683N/A setup_session_environment (GdmSessionDirect *session)
18683N/A gdm_session_direct_set_environment_variable (session,
18683N/A@@ -2050,15 +2053,20 @@ setup_session_environment (GdmSessionDir
18683N/A+ passwd_entry = getpwnam (session->priv->selected_user);
18683N/A+ if (passwd_entry != NULL && passwd_entry->pw_uid == 0)
18683N/A+ path_str = gdm_read_default ("SUPATH=");
18683N/A+ path_str = gdm_read_default ("PATH=");
18683N/A+ path_str = GDM_SESSION_DEFAULT_PATH;
18683N/A /* FIXME: We do this here and in the session worker. We should consolidate
18683N/A- gdm_session_direct_set_environment_variable (session,
18683N/A- BINDIR ":" GDM_SESSION_DEFAULT_PATH);
18683N/A+ gdm_session_direct_set_environment_variable (session, "PATH", path_str);
18683N/A@@ -1443,9 +1443,28 @@ gdm_session_worker_authorize_user (GdmSe
16880N/A g_debug ("GdmSessionWorker: determining if authenticated user is authorized to session");
16880N/A+ consoleonly = gdm_read_default ("CONSOLE=");
16880N/A+ if (worker->priv->hostname != NULL && worker->priv->hostname[0] != '\0') {
16880N/A+ passwd_entry = getpwnam (worker->priv->username);
16880N/A+ if (passwd_entry->pw_uid == 0) {
16880N/A+ g_debug ("The system administrator is not allowed to log in remotely");
18683N/A@@ -1648,6 +1667,7 @@ gdm_session_worker_accredit_user (GdmSes
18683N/A@@ -1687,17 +1707,17 @@ gdm_session_worker_accredit_user (GdmSes
16880N/A- /* Let's give the user a default PATH if he doesn't already have one
16880N/A- if (!gdm_session_worker_environment_variable_is_set (worker, "PATH")) {
16880N/A- gdm_session_worker_set_environment_variable (worker, "PATH",
16880N/A- gdm_session_worker_set_environment_variable (worker, "PATH",
16880N/A- BINDIR ":" GDM_SESSION_DEFAULT_PATH);
16880N/A+ path_str = gdm_read_default ("SUPATH=");
16880N/A+ path_str = gdm_read_default ("PATH=");
16880N/A+ path_str = GDM_SESSION_DEFAULT_PATH;
16880N/A+ gdm_session_worker_set_environment_variable (worker, "PATH", path_str);
16880N/A if (! _change_user (worker, uid, gid)) {
16880N/A g_debug ("GdmSessionWorker: Unable to change to user");
18683N/A@@ -2315,6 +2335,14 @@ do_setup (GdmSessionWorker *worker)
16880N/A+ passreq = gdm_read_default ("PASSREQ=");
16880N/A+ if ((passreq != NULL) && g_ascii_strcasecmp (passreq, "YES") == 0)
16880N/A+ worker->priv->password_is_required = TRUE;
16880N/A+ worker->priv->password_is_required = FALSE;
16880N/A worker->priv->user_settings = gdm_session_settings_new ();