This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository remote-login-service-x2go. commit 41c204c6b9c28779c7a7afbb1ba17be5d100dc7d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 18 22:15:09 2015 +0200 fork remote-login-service as remote-logon-service --- README | 9 +-- configure.ac | 6 +- data/Makefile.am | 13 ++-- data/com.canonical.RemoteLogin.service.in | 3 - data/org.ArcticaProject.RemoteLogon.service.in | 3 + data/remote-login-service.conf.in | 6 -- data/remote-logon-service.conf.in | 6 ++ debian/changelog | 4 +- debian/control | 14 +++-- debian/copyright | 4 +- po/POTFILES.in | 4 +- src/Makefile.am | 28 ++++----- src/defines.h | 2 +- src/main.c | 28 ++++----- ...ogin.xml => org.ArcticaProject.RemoteLogon.xml} | 2 +- src/uccs-server.c | 10 +-- tests/Makefile.am | 2 +- tests/dbus-interface.c | 66 ++++++++++---------- tests/null-config.conf | 2 +- tests/slmock | 12 ++-- tests/slmock-config.conf.in | 2 +- tests/uccs-config.conf | 2 +- 22 files changed, 115 insertions(+), 113 deletions(-) diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e69de29 diff --git a/README b/README index 3e6b56e..3519c77 100644 --- a/README +++ b/README @@ -1,6 +1,7 @@ A small service to grab various remote login possibilities from the local -network configuration, network servers that provide them, and present them -to the user to log into for both applications and full desktop posibilities. +network configuration, network servers +that provide them, and present them to the user to log into for both +applications and full desktop posibilities. -This project has been forked by the X2Go Project to support Remote Login -against Linux machines via X2Go. \ No newline at end of file +This project has been forked by the X2Go/Arctica Project +to support Remote Login against Linux machines via X2Go. diff --git a/configure.ac b/configure.ac index dc5c339..decd462 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(remote-login-service-x2go, 1.0.0.1) +AC_INIT(remote-logon-service, 1.0.0.1) AC_PREREQ(2.53) AM_INIT_AUTOMAKE([]) @@ -29,7 +29,7 @@ PKG_CHECK_MODULES(TEST, dbustest-1) AC_CHECK_LIB(gcrypt, gcry_cipher_get_algo_keylen, GCRYPT_LIBS="-lgcrypt") if test x"$GCRYPT_LIBS" = x ; then - echo "You need libgcrypt to compile remote-login-service-x2go"; + echo "You need libgcrypt to compile remote-logon-service"; exit fi @@ -88,7 +88,7 @@ AC_SUBST(GCRYPT_LIBS) ########################### IT_PROG_INTLTOOL([0.35.0]) -GETTEXT_PACKAGE=remote-login-service +GETTEXT_PACKAGE=remote-logon-service AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package]) AC_DEFINE_PATH(LOCALEDIR, "${datadir}/locale", [locale directory]) diff --git a/data/Makefile.am b/data/Makefile.am index 633eda4..3ba4d21 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,10 +1,9 @@ - config_file_DATA = \ - remote-login-service.conf + remote-logon-service.conf config_filedir = $(sysconfdir) dbus_servicesdir = $(DBUSSERVICEDIR) -dbus_services_DATA = com.canonical.RemoteLogin.service +dbus_services_DATA = org.ArcticaProject.RemoteLogon.service %.service: %.service.in sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ @@ -13,10 +12,10 @@ dbus_services_DATA = com.canonical.RemoteLogin.service $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ EXTRA_DIST = \ - com.canonical.RemoteLogin.service.in \ - remote-login-service.conf.in + org.ArcticaProject.RemoteLogon.service.in \ + remote-logon-service.conf.in CLEANFILES = \ - com.canonical.RemoteLogin.service \ - remote-login-service.conf + org.ArcticaProject.RemoteLogon.service \ + remote-logon-service.conf diff --git a/data/com.canonical.RemoteLogin.service.in b/data/com.canonical.RemoteLogin.service.in deleted file mode 100644 index 5595c76..0000000 --- a/data/com.canonical.RemoteLogin.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=com.canonical.RemoteLogin -Exec=@pkglibexecdir@/remote-login-service diff --git a/data/org.ArcticaProject.RemoteLogon.service.in b/data/org.ArcticaProject.RemoteLogon.service.in new file mode 100644 index 0000000..0961dbb --- /dev/null +++ b/data/org.ArcticaProject.RemoteLogon.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.ArcticaProject.RemoteLogon +Exec=@pkglibexecdir@/remote-logon-service diff --git a/data/remote-login-service.conf.in b/data/remote-login-service.conf.in deleted file mode 100644 index 6a7e360..0000000 --- a/data/remote-login-service.conf.in +++ /dev/null @@ -1,6 +0,0 @@ -[Remote Login Service] -Servers=X2Go Session Broker - -[Server X2Go Session Broker] -_Name=Remote Login X2Go -URI=http://localhost:8080/uccs/inifile/ diff --git a/data/remote-logon-service.conf.in b/data/remote-logon-service.conf.in new file mode 100644 index 0000000..5cadcc9 --- /dev/null +++ b/data/remote-logon-service.conf.in @@ -0,0 +1,6 @@ +[Remote Logon Service] +Servers=Session Broker + +[Server Session Broker] +_Name=Remote Logon +URI=http://localhost:8080/uccs/inifile/ diff --git a/debian/changelog b/debian/changelog index 7cafd44..bcae98c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -remote-login-service-x2go (1.0.0.1-0x2go1) UNRELEASED; urgency=medium +remote-logon-service (1.0.0.1-0x2go1) UNRELEASED; urgency=medium + + * Rename src:package and bin:package: -> remote-logon-service. * First forked/upstream release (1.0.0.1): - Apply patch 01_clear_servers.patch. diff --git a/debian/control b/debian/control index 00f1657..8c06e8b 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: remote-login-service-x2go +Source: remote-logon-service Section: misc Priority: extra Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> @@ -18,15 +18,17 @@ Build-Depends: dbus-test-runner, python3, Standards-Version: 3.9.6 Homepage: http://www.x2go.org -Vcs-Git: git://code.x2go.org/remote-login-service-x2go.git -Vcs-Browser: http://code.x2go.org/gitweb?p=remote-login-service-x2go.git;a=summary +Vcs-Git: git://code.x2go.org/remote-logon-service.git +Vcs-Browser: http://code.x2go.org/gitweb?p=remote-logon-service.git;a=summary -Package: remote-login-service-x2go +Package: remote-logon-service Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, -Breaks: remote-login-service -Replaces: remote-login-service +#Breaks: remote-login-service, +# remote-logon-services-x2go (<< 1.0.0.2), +#Replaces: remote-login-service, +# remote-login-services-x2go (<< 1.0.0.2), Recommends: thin-client-config-agent Description: Service to track the remote servers to use A small service to take the various sources for the remote diff --git a/debian/copyright b/debian/copyright index f42fc22..fa846af 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: remote-login-service-x2go +Upstream-Name: remote-logon-service Upstream-Contact: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Source: http://code.x2go.org/gitweb?p=remote-login-service-x2go.git;a=summary +Source: http://code.x2go.org/gitweb?p=remote-logon-service-x2go.git;a=summary Files: * Copyright: 2012, Canonical Ltd. diff --git a/po/POTFILES.in b/po/POTFILES.in index 12b4fa6..d886310 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,6 @@ -[type: gettext/ini] data/remote-login-service.conf.in +[type: gettext/ini] data/remote-logon-service.conf.in src/server.c -src/remote-login.c +src/remote-logon.c src/rdp-server.c src/citrix-server.c src/x2go-server.c diff --git a/src/Makefile.am b/src/Makefile.am index b5f5d5b..fa9b8c7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,8 @@ - pkglibexec_PROGRAMS = \ - remote-login-service + remote-logon-service EXTRA_DIST = \ - com.canonical.RemoteLogin.xml + org.ArcticaProject.RemoteLogon.xml noinst_LTLIBRARIES = \ libservers.la \ @@ -14,14 +13,14 @@ noinst_LTLIBRARIES = \ ################################ libgenerated_la_SOURCES = \ - remote-login.c \ - remote-login.h + remote-logon.c \ + remote-logon.h libgenerated_la_CFLAGS = \ $(SERVICE_CFLAGS) -$(libgenerated_la_SOURCES): com.canonical.RemoteLogin.xml +$(libgenerated_la_SOURCES): org.ArcticaProject.RemoteLogon.xml gdbus-codegen \ - --interface-prefix com.canonical \ - --generate-c remote-login \ + --interface-prefix org.ArcticaProject \ + --generate-c remote-logon \ $^ BUILT_SOURCES = $(libgenerated_la_SOURCES) @@ -53,19 +52,18 @@ libservers_la_LDFLAGS = \ $(COVERAGE_LDFLAGS) $(GCRYPT_LIBS) -lm ################################ -# remote-login-service +# remote-logon-service ################################ -remote_login_service_CFLAGS = \ - -DDEFAULT_CONFIG_FILE="\"$(sysconfdir)/remote-login-service.conf\"" \ +remote_logon_service_CFLAGS = \ + -DDEFAULT_CONFIG_FILE="\"$(sysconfdir)/remote-logon-service.conf\"" \ $(SERVICE_CFLAGS) \ $(COVERAGE_CFLAGS) -remote_login_service_LDADD = \ +remote_logon_service_LDADD = \ $(builddir)/libservers.la \ $(builddir)/libgenerated.la \ $(SERVICE_LIBS) -remote_login_service_LDFLAGS = \ +remote_logon_service_LDFLAGS = \ $(COVERAGE_LDFLAGS) -remote_login_service_SOURCES = \ +remote_logon_service_SOURCES = \ main.c - diff --git a/src/defines.h b/src/defines.h index e205d2c..3747db1 100644 --- a/src/defines.h +++ b/src/defines.h @@ -19,7 +19,7 @@ #ifndef __DEFINES_H__ #define __DEFINES_H__ -#define CONFIG_MAIN_GROUP "Remote Login Service" +#define CONFIG_MAIN_GROUP "Remote Logon Service" #define CONFIG_MAIN_SERVERS "Servers" #define CONFIG_SERVER_PREFIX "Server" #define CONFIG_SERVER_NAME "Name" diff --git a/src/main.c b/src/main.c index 74e09e0..80a5745 100644 --- a/src/main.c +++ b/src/main.c @@ -26,7 +26,7 @@ /* NOTE: Required to build without optimizations */ #include <locale.h> -#include "remote-login.h" +#include "remote-logon.h" #include "defines.h" #include "server.h" @@ -51,7 +51,7 @@ error_domain (void) { static GQuark value = 0; if (value == 0) { - value = g_quark_from_static_string("remote-login-service"); + value = g_quark_from_static_string("remote-logon-service"); } return value; } @@ -59,7 +59,7 @@ error_domain (void) /* When one of the state changes on the server emit that so that everone knows there might be a new server available. */ static void -server_status_updated (Server * server, ServerState newstate, RemoteLogin * rl) +server_status_updated (Server * server, ServerState newstate, RemoteLogon * rl) { GVariant * array = NULL; @@ -73,14 +73,14 @@ server_status_updated (Server * server, ServerState newstate, RemoteLogin * rl) array = g_variant_new_array(G_VARIANT_TYPE("(sssba(sbva{sv})a(si))"), NULL, 0); } - remote_login_emit_servers_updated(rl, array); + remote_logon_emit_servers_updated(rl, array); return; } /* Looks for the config file and does some basic parsing to pull out the UCCS servers that are configured in it */ static void -find_config_file (GKeyFile * parsed, const gchar * cmnd_line, RemoteLogin * rl) +find_config_file (GKeyFile * parsed, const gchar * cmnd_line, RemoteLogon * rl) { GError * error = NULL; const gchar * file = DEFAULT_CONFIG_FILE; @@ -151,7 +151,7 @@ server_list_to_array (GVariantBuilder * builder, GList * items) } static gboolean -handle_get_servers (RemoteLogin * rl, GDBusMethodInvocation * invocation, gpointer user_data) +handle_get_servers (RemoteLogon * rl, GDBusMethodInvocation * invocation, gpointer user_data) { GVariant * array = NULL; @@ -197,7 +197,7 @@ handle_get_servers_login_cb (UccsServer * server, gboolean unlocked, gpointer us /* Handle the GetServerForLogin DBus call */ static gboolean -handle_get_servers_login (RemoteLogin * rl, GDBusMethodInvocation * invocation, gpointer user_data) +handle_get_servers_login (RemoteLogon * rl, GDBusMethodInvocation * invocation, gpointer user_data) { GVariant * params = g_dbus_method_invocation_get_parameters(invocation); const gchar * sender = g_dbus_method_invocation_get_sender(invocation); @@ -283,7 +283,7 @@ handle_get_domains_list_helper (GList * list, const gchar * uri) /* Get the cached domains for a server */ static gboolean -handle_get_domains (RemoteLogin * rl, GDBusMethodInvocation * invocation, gpointer user_data) +handle_get_domains (RemoteLogon * rl, GDBusMethodInvocation * invocation, gpointer user_data) { GVariant * params = g_dbus_method_invocation_get_parameters(invocation); @@ -321,7 +321,7 @@ handle_get_domains (RemoteLogin * rl, GDBusMethodInvocation * invocation, gpoint /* Set a given server as last used */ static gboolean -handle_set_last_used_server (RemoteLogin * rl, GDBusMethodInvocation * invocation, gpointer user_data) +handle_set_last_used_server (RemoteLogon * rl, GDBusMethodInvocation * invocation, gpointer user_data) { GVariant * params = g_dbus_method_invocation_get_parameters(invocation); @@ -379,7 +379,7 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data) static gchar * cmnd_line_config = NULL; static GOptionEntry general_options[] = { - {"config-file", 'c', 0, G_OPTION_ARG_FILENAME, &cmnd_line_config, N_("Configuration file for the remote login service. Defaults to '/etc/remote-login-service.conf'."), N_("key_file")}, + {"config-file", 'c', 0, G_OPTION_ARG_FILENAME, &cmnd_line_config, N_("Configuration file for the remote logon service. Defaults to '/etc/remote-logon-service.conf'."), N_("key_file")}, {NULL} }; @@ -405,7 +405,7 @@ main (int argc, char * argv[]) /* Handle command line parameters */ GOptionContext * context; context = g_option_context_new(_("- Determine the remote servers that can be logged into")); - g_option_context_add_main_entries(context, general_options, "remote-login-service"); + g_option_context_add_main_entries(context, general_options, "remote-logon-service"); if (!g_option_context_parse(context, &argc, &argv, &error)) { g_print("option parsing failed: %s\n", error->message); @@ -422,11 +422,11 @@ main (int argc, char * argv[]) } /* Build Dbus Interface */ - RemoteLogin * skel = remote_login_skeleton_new(); + RemoteLogon * skel = remote_logon_skeleton_new(); /* Export it */ g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(skel), session_bus, - "/com/canonical/RemoteLogin", + "/org/ArcticaProject/RemoteLogon", NULL); g_signal_connect(skel, "handle-get-servers", G_CALLBACK(handle_get_servers), NULL); g_signal_connect(skel, "handle-get-servers-for-login", G_CALLBACK(handle_get_servers_login), NULL); @@ -434,7 +434,7 @@ main (int argc, char * argv[]) g_signal_connect(skel, "handle-set-last-used-server", G_CALLBACK(handle_set_last_used_server), NULL); g_bus_own_name_on_connection(session_bus, - "com.canonical.RemoteLogin", + "org.ArcticaProject.RemoteLogon", G_BUS_NAME_OWNER_FLAGS_NONE, NULL, /* aquired handler */ name_lost, diff --git a/src/com.canonical.RemoteLogin.xml b/src/org.ArcticaProject.RemoteLogon.xml similarity index 98% rename from src/com.canonical.RemoteLogin.xml rename to src/org.ArcticaProject.RemoteLogon.xml index f0d8cb1..9e1bd26 100644 --- a/src/com.canonical.RemoteLogin.xml +++ b/src/org.ArcticaProject.RemoteLogon.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <node name="/"> - <interface name="com.canonical.RemoteLogin"> + <interface name="org.ArcticaProject.RemoteLogon"> <!-- SERVER LIST DOCS - it's in a few places :-) s: server type: "ica", "freerdp", "x2go", "uccs" s: server name diff --git a/src/uccs-server.c b/src/uccs-server.c index d8c61a9..69710df 100644 --- a/src/uccs-server.c +++ b/src/uccs-server.c @@ -180,9 +180,9 @@ clear_hash_helper (gpointer key, gpointer value, gpointer user_data) g_dbus_connection_emit_signal(helper->session, (const gchar *)key, /* dest */ - "/com/canonical/RemoteLogin", /* object path */ - "com.canonical.RemoteLogin", /* interface name */ - "com.canonical.RemoteLogin.LoginChanged", /* signal name */ + "/org/ArcticaProject/RemoteLogon", /* object path */ + "org.ArcticaProject.RemoteLogon", /* interface name */ + "org.ArcticaProject.RemoteLogon.LoginChanged", /* signal name */ helper->params, /* params */ &error); @@ -807,7 +807,7 @@ uccs_server_get_servers (UccsServer * server, const gchar * address) gchar *last_used_server_name = NULL; if (server->username != NULL && server->password != NULL) { gchar *username_sha = g_compute_checksum_for_string (G_CHECKSUM_SHA256, server->username, -1); - gchar *file_path = g_build_path ("/", g_get_user_cache_dir(), "remote-login-service", "cache", username_sha, NULL); + gchar *file_path = g_build_path ("/", g_get_user_cache_dir(), "remote-logon-service", "cache", username_sha, NULL); gchar *encryptedContents; gsize encryptedContentsLength; if (g_file_get_contents (file_path, &encryptedContents, &encryptedContentsLength, NULL)) { @@ -932,7 +932,7 @@ set_last_used_server (Server * server, const gchar * uri) gchar *enc_data = do_aes_encrypt(data, UCCS_SERVER(server)->password, &enc_data_length); g_free (data); - gchar *dir_path = g_build_path ("/", g_get_user_cache_dir(), "remote-login-service", "cache", NULL); + gchar *dir_path = g_build_path ("/", g_get_user_cache_dir(), "remote-logon-service", "cache", NULL); gint status = g_mkdir_with_parents (dir_path, 0700); if (status == 0) { diff --git a/tests/Makefile.am b/tests/Makefile.am index bc52633..9a34654 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -60,7 +60,7 @@ slmock-config.conf: slmock-config.conf.in dbus_interface_SOURCES = \ dbus-interface.c dbus_interface_CFLAGS = \ - -DREMOTE_LOGIN_SERVICE="\"$(abs_top_builddir)/src/remote-login-service\"" \ + -DREMOTE_LOGON_SERVICE="\"$(abs_top_builddir)/src/remote-logon-service\"" \ -DUCCS_CONFIG_FILE="\"$(abs_srcdir)/uccs-config.conf\"" \ -DSLMOCK_CONFIG_FILE="\"$(abs_builddir)/slmock-config.conf\"" \ -DNULL_CONFIG_FILE="\"$(abs_srcdir)/null-config.conf\"" \ diff --git a/tests/dbus-interface.c b/tests/dbus-interface.c index 2427b34..e67b60c 100644 --- a/tests/dbus-interface.c +++ b/tests/dbus-interface.c @@ -150,15 +150,15 @@ slmock_check_login(GDBusConnection * session, slmock_table_t * slmockdata, gbool { if (clear_cache) { gchar *username_sha = g_compute_checksum_for_string (G_CHECKSUM_SHA256, slmockdata->username, -1); - gchar *file_path = g_build_path ("/", g_get_user_cache_dir(), "remote-login-service", "cache", username_sha, NULL); + gchar *file_path = g_build_path ("/", g_get_user_cache_dir(), "remote-logon-service", "cache", username_sha, NULL); unlink (file_path); g_free (username_sha); g_free (file_path); } GVariant * retval = g_dbus_connection_call_sync(session, - "com.canonical.RemoteLogin", - "/com/canonical/RemoteLogin", - "com.canonical.RemoteLogin", + "org.ArcticaProject.RemoteLogon", + "/org/ArcticaProject/RemoteLogon", + "org.ArcticaProject.RemoteLogon", "GetServersForLogin", g_variant_new("(sssb)", "https://slmock.com/", @@ -203,13 +203,13 @@ test_getservers_slmock (gconstpointer data) DbusTestService * service = dbus_test_service_new(NULL); /* RLS */ - DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGIN_SERVICE); + DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGON_SERVICE); dbus_test_process_append_param(rls, "--config-file=" SLMOCK_CONFIG_FILE); dbus_test_service_add_task(service, DBUS_TEST_TASK(rls)); /* Dummy */ DbusTestTask * dummy = dbus_test_task_new(); - dbus_test_task_set_wait_for(dummy, "com.canonical.RemoteLogin"); + dbus_test_task_set_wait_for(dummy, "org.ArcticaProject.RemoteLogon"); dbus_test_service_add_task(service, dummy); /* Get RLS up and running and us on that bus */ @@ -233,13 +233,13 @@ test_getservers_slmock_none (void) DbusTestService * service = dbus_test_service_new(NULL); /* RLS */ - DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGIN_SERVICE); + DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGON_SERVICE); dbus_test_process_append_param(rls, "--config-file=" SLMOCK_CONFIG_FILE); dbus_test_service_add_task(service, DBUS_TEST_TASK(rls)); /* Dummy */ DbusTestTask * dummy = dbus_test_task_new(); - dbus_test_task_set_wait_for(dummy, "com.canonical.RemoteLogin"); + dbus_test_task_set_wait_for(dummy, "org.ArcticaProject.RemoteLogon"); dbus_test_service_add_task(service, dummy); /* Get RLS up and running and us on that bus */ @@ -249,9 +249,9 @@ test_getservers_slmock_none (void) g_dbus_connection_set_exit_on_close(session, FALSE); GVariant * retval = g_dbus_connection_call_sync(session, - "com.canonical.RemoteLogin", - "/com/canonical/RemoteLogin", - "com.canonical.RemoteLogin", + "org.ArcticaProject.RemoteLogon", + "/org/ArcticaProject/RemoteLogon", + "org.ArcticaProject.RemoteLogon", "GetServersForLogin", g_variant_new("(sssb)", "https://slmock.com/", @@ -289,13 +289,13 @@ test_getservers_slmock_two (void) DbusTestService * service = dbus_test_service_new(NULL); /* RLS */ - DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGIN_SERVICE); + DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGON_SERVICE); dbus_test_process_append_param(rls, "--config-file=" SLMOCK_CONFIG_FILE); dbus_test_service_add_task(service, DBUS_TEST_TASK(rls)); /* Dummy */ DbusTestTask * dummy = dbus_test_task_new(); - dbus_test_task_set_wait_for(dummy, "com.canonical.RemoteLogin"); + dbus_test_task_set_wait_for(dummy, "org.ArcticaProject.RemoteLogon"); dbus_test_service_add_task(service, dummy); /* Get RLS up and running and us on that bus */ @@ -320,13 +320,13 @@ test_getservers_none (void) DbusTestService * service = dbus_test_service_new(NULL); /* RLS */ - DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGIN_SERVICE); + DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGON_SERVICE); dbus_test_process_append_param(rls, "--config-file=" NULL_CONFIG_FILE); dbus_test_service_add_task(service, DBUS_TEST_TASK(rls)); /* Dummy */ DbusTestTask * dummy = dbus_test_task_new(); - dbus_test_task_set_wait_for(dummy, "com.canonical.RemoteLogin"); + dbus_test_task_set_wait_for(dummy, "org.ArcticaProject.RemoteLogon"); dbus_test_service_add_task(service, dummy); /* Get RLS up and running and us on that bus */ @@ -336,9 +336,9 @@ test_getservers_none (void) g_dbus_connection_set_exit_on_close(session, FALSE); GVariant * retval = g_dbus_connection_call_sync(session, - "com.canonical.RemoteLogin", - "/com/canonical/RemoteLogin", - "com.canonical.RemoteLogin", + "org.ArcticaProject.RemoteLogon", + "/org/ArcticaProject/RemoteLogon", + "org.ArcticaProject.RemoteLogon", "GetServers", NULL, /* params */ G_VARIANT_TYPE("(a(sssba(sbva{sv})a(si)))"), /* ret type */ @@ -370,13 +370,13 @@ test_getservers_uccs (void) DbusTestService * service = dbus_test_service_new(NULL); /* RLS */ - DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGIN_SERVICE); + DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGON_SERVICE); dbus_test_process_append_param(rls, "--config-file=" UCCS_CONFIG_FILE); dbus_test_service_add_task(service, DBUS_TEST_TASK(rls)); /* Dummy */ DbusTestTask * dummy = dbus_test_task_new(); - dbus_test_task_set_wait_for(dummy, "com.canonical.RemoteLogin"); + dbus_test_task_set_wait_for(dummy, "org.ArcticaProject.RemoteLogon"); dbus_test_service_add_task(service, dummy); /* Get RLS up and running and us on that bus */ @@ -386,9 +386,9 @@ test_getservers_uccs (void) g_dbus_connection_set_exit_on_close(session, FALSE); GVariant * retval = g_dbus_connection_call_sync(session, - "com.canonical.RemoteLogin", - "/com/canonical/RemoteLogin", - "com.canonical.RemoteLogin", + "org.ArcticaProject.RemoteLogon", + "/org/ArcticaProject/RemoteLogon", + "org.ArcticaProject.RemoteLogon", "GetServers", NULL, /* params */ G_VARIANT_TYPE("(a(sssba(sbva{sv})a(si)))"), /* ret type */ @@ -444,13 +444,13 @@ test_getdomains_basic (void) DbusTestService * service = dbus_test_service_new(NULL); /* RLS */ - DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGIN_SERVICE); + DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGON_SERVICE); dbus_test_process_append_param(rls, "--config-file=" SLMOCK_CONFIG_FILE); dbus_test_service_add_task(service, DBUS_TEST_TASK(rls)); /* Dummy */ DbusTestTask * dummy = dbus_test_task_new(); - dbus_test_task_set_wait_for(dummy, "com.canonical.RemoteLogin"); + dbus_test_task_set_wait_for(dummy, "org.ArcticaProject.RemoteLogon"); dbus_test_service_add_task(service, dummy); /* Get RLS up and running and us on that bus */ @@ -461,9 +461,9 @@ test_getdomains_basic (void) GError * error = NULL; GVariant * retval = g_dbus_connection_call_sync(session, - "com.canonical.RemoteLogin", - "/com/canonical/RemoteLogin", - "com.canonical.RemoteLogin", + "org.ArcticaProject.RemoteLogon", + "/org/ArcticaProject/RemoteLogon", + "org.ArcticaProject.RemoteLogon", "GetCachedDomainsForServer", g_variant_new("(s)", "https://slmock.com/"), /* params */ G_VARIANT_TYPE("(as)"), /* ret type */ @@ -501,13 +501,13 @@ test_setlastused_basic (void) DbusTestService * service = dbus_test_service_new(NULL); /* RLS */ - DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGIN_SERVICE); + DbusTestProcess * rls = dbus_test_process_new(REMOTE_LOGON_SERVICE); dbus_test_process_append_param(rls, "--config-file=" SLMOCK_CONFIG_FILE); dbus_test_service_add_task(service, DBUS_TEST_TASK(rls)); /* Dummy */ DbusTestTask * dummy = dbus_test_task_new(); - dbus_test_task_set_wait_for(dummy, "com.canonical.RemoteLogin"); + dbus_test_task_set_wait_for(dummy, "org.ArcticaProject.RemoteLogon"); dbus_test_service_add_task(service, dummy); /* Get RLS up and running and us on that bus */ @@ -520,9 +520,9 @@ test_setlastused_basic (void) GError * error = NULL; GVariant * retval = g_dbus_connection_call_sync(session, - "com.canonical.RemoteLogin", - "/com/canonical/RemoteLogin", - "com.canonical.RemoteLogin", + "org.ArcticaProject.RemoteLogon", + "/org/ArcticaProject/RemoteLogon", + "org.ArcticaProject.RemoteLogon", "SetLastUsedServer", g_variant_new("(ss)", "Landscape", freerdp_server_table[1].uri), /* params */ NULL, /* ret type */ diff --git a/tests/null-config.conf b/tests/null-config.conf index 18184d0..f00a4f8 100644 --- a/tests/null-config.conf +++ b/tests/null-config.conf @@ -1,2 +1,2 @@ -[Remote Login Service] +[Remote Logon Service] DummyValue=This is intentionally left blank diff --git a/tests/slmock b/tests/slmock index b3b5019..1007328 100755 --- a/tests/slmock +++ b/tests/slmock @@ -65,7 +65,7 @@ def convert_to_builtin_type(obj): return d def freerdp(email): - ms = ManagementServer("http://tc.canonical.com", "Landscape") + ms = ManagementServer("http://tc.arctica-project.org", "Landscape") ts1 = TerminalServer("23.21.151.133", "FreeRDP US", "freerdp", False, "Administrator") ts2 = TerminalServer("46.137.222.181", "FreeRDP Asia", "freerdp", False, @@ -99,7 +99,7 @@ def error(email): print_error("Server did not respond") def citrix(email): - ms = ManagementServer("http://tc.canonical.com", "Landscape") + ms = ManagementServer("http://tc.arctica-project.org", "Landscape") ts1 = TerminalServer("107.21.17.35", "Citrix USA", "ICA", True, "useradmin1") ts2 = TerminalServer("107.21.17.35", "Citrix 2", "ICA", True, @@ -119,7 +119,7 @@ def citrix(email): print(ms.toJson()) def vmware(email): - ms = ManagementServer("http://tc.canonical.com", "Landscape") + ms = ManagementServer("http://tc.arctica-project.org", "Landscape") ts = TerminalServer("https://10.193.37.140", "VMWare-View Lexington", "vmware", True, "Administrator") ts.add_domain("VMWARE") @@ -127,7 +127,7 @@ def vmware(email): print(ms.toJson()) def defaults(email): - ms = ManagementServer("http://tc.canonical.com", "Landscape") + ms = ManagementServer("http://tc.arctica-project.org", "Landscape") ts1 = TerminalServer("https://10.10.10.10", "AAA", "vmware") ts2 = TerminalServer("https://10.10.10.10", "ZZZ", "vmware") ts3 = TerminalServer("https://10.10.10.10", "MMM-Default", "vmware", True) @@ -143,7 +143,7 @@ def defaults(email): # a choice of random problems in the json that the parser should catch def missing_fields(email): val = random.randint(1,4) - ms = ManagementServer("http://tc.canonical.com", "Landscape") + ms = ManagementServer("http://tc.arctica-project.org", "Landscape") ts3 = TerminalServer("https://10.10.10.10", "TS1-Default", "vmware", True) ts3.add_domain("VMWARE") ms.set_default(ts3.Name) @@ -169,7 +169,7 @@ def missing_fields(email): print(ms.toJson()) def big(email): - ms = ManagementServer("http://tc.canonical.com", "Landscape") + ms = ManagementServer("http://tc.arctica-project.org", "Landscape") ts1 = TerminalServer("107.21.17.35", "XenServer", "ICA") ts2 = TerminalServer("http://1.2.3.4", "Citrix2", "ICA", True, diff --git a/tests/slmock-config.conf.in b/tests/slmock-config.conf.in index ca285a9..153ab2e 100644 --- a/tests/slmock-config.conf.in +++ b/tests/slmock-config.conf.in @@ -1,4 +1,4 @@ -[Remote Login Service] +[Remote Logon Service] Servers=SLMock Server [Server SLMock Server] diff --git a/tests/uccs-config.conf b/tests/uccs-config.conf index ea1a82c..55a6573 100644 --- a/tests/uccs-config.conf +++ b/tests/uccs-config.conf @@ -1,4 +1,4 @@ -[Remote Login Service] +[Remote Logon Service] Servers=Test Server [Server Test Server] -- Alioth's /srv/git/code.x2go.org/remote-login-service-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/remote-login-service-x2go.git