diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-11-03 12:46:27 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-11-03 12:46:27 +0100 |
| commit | ecb6bd24f4fc69b4b4332630f07ef428c4f101e7 (patch) | |
| tree | 460b25676c05ced3570325ea01f48104fc185ca3 | |
| parent | 4739ebb61fe0774eabce2eeea74c84912654812c (diff) | |
| download | remote-logon-service-ecb6bd24f4fc69b4b4332630f07ef428c4f101e7.tar.gz remote-logon-service-ecb6bd24f4fc69b4b4332630f07ef428c4f101e7.tar.bz2 remote-logon-service-ecb6bd24f4fc69b4b4332630f07ef428c4f101e7.zip | |
Apply 02_server-name.patch. Provide support for non-Canonical UCCS servers.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | src/uccs-server.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index c393ad5..4dadca3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ remote-login-service-x2go (1.0.0.1-0x2go1) UNRELEASED; urgency=medium - Apply patch 01_clear_servers.patch. - Apply patch glib-deprecated.diff. Provide support for old GLib versions. + - Apply 02_server-name.patch. Provide support for non-Canonical + UCCS servers. * Add SERVER_NAME env var support. * Add X2Go support to RLS. * Provide via ppa:x2go/ppa and ppa:x2go/stable on Launchpad. diff --git a/src/uccs-server.c b/src/uccs-server.c index 0ec6f04..d8c61a9 100644 --- a/src/uccs-server.c +++ b/src/uccs-server.c @@ -20,6 +20,7 @@ #include "config.h" #endif +#include <glib.h> #include <glib/gi18n.h> #include <json-glib/json-glib.h> @@ -734,6 +735,8 @@ uccs_server_unlock (UccsServer * server, const gchar * address, const gchar * us argv[1] = server->username; argv[2] = NULL; + g_setenv("SERVER_ROOT", server->parent.uri, TRUE); + g_spawn_async_with_pipes(NULL, /* pwd */ (gchar **)argv, NULL, /* env */ |