Skip to content

Blacklist some session-specific variables (with corrected author name) #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
raveit65 wants to merge 1 commit into from
Closed

Blacklist some session-specific variables (with corrected author name) #303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion mate-session/gsm-util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@

static gchar *_saved_session_dir = NULL;

static const char * const variable_blacklist[] = {
"XDG_SEAT",
"XDG_SESSION_ID",
"XDG_VTNR",
NULL
};

gchar **
gsm_get_screen_locker_command (void)
{
Expand Down Expand Up @@ -536,6 +543,9 @@ gsm_util_export_activation_environment (GError **error)
const char *entry_name = entry_names[i];
const char *entry_value = g_getenv (entry_name);

if (g_strv_contains (variable_blacklist, entry_name))
continue;

if (!g_utf8_validate (entry_name, -1, NULL))
continue;

Expand Down Expand Up @@ -603,8 +613,13 @@ gsm_util_export_user_environment (GError **error)
return FALSE;
}

entries = g_get_environ ();

for (; variable_blacklist[i] != NULL; i++)
entries = g_environ_unsetenv (entries, variable_blacklist[i]);

g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
for (entries = g_get_environ (); entries[i] != NULL; i++) {
for (i = 0; entries[i] != NULL; i++) {
const char *entry = entries[i];

if (!g_utf8_validate (entry, -1, NULL))
Expand Down