Merge lp:~ted/remote-login-service/signal-ready into lp:~ted/remote-login-service/oo-cleanup

[Ted Gould]

Add a state to the servers to know if they're configured

[lp:~ted/remote-login-service/signal-ready]

76. By Ted Gould on 2012-09-11

Add an executable for the build system that don't have thin-client-config-agent

77. By Ted Gould on 2012-09-11

Attaching bug

Unmerged revisions

77. By Ted Gould on 2012-09-11

Attaching bug

76. By Ted Gould on 2012-09-11

Add an executable for the build system that don't have thin-client-config-agent

75. By Ted Gould on 2012-09-10

Don't need a tuple there apparently

74. By Ted Gould on 2012-09-10

Add a test to ensure we signaled updates

73. By Ted Gould on 2012-09-10

Pulling out the set_exec code so that we can test the signal stuff

72. By Ted Gould on 2012-09-10

When the server list changes emit the dbus signal

71. By Ted Gould on 2012-09-10

Handle a race with an extra DBus message

70. By Ted Gould on 2012-09-10

Moving where the config file is parsed to the servers aren't created until we've connected to DBus

69. By Ted Gould on 2012-09-10

Watching for servers updating themselves

68. By Ted Gould on 2012-09-10

Better handle the case of zero all good servers

=== modified file 'src/citrix-server.c'
--- src/citrix-server.c	2012-08-29 19:09:54 +0000
+++ src/citrix-server.c	2012-09-10 21:37:19 +0000
@@ -20,6 +20,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "citrix-server.h"
 #include "defines.h"
 
@@ -49,6 +51,10 @@
 static void
 citrix_server_init (CitrixServer *self)
 {
+	self->username = NULL;
+	self->password = NULL;
+	self->domain = NULL;
+	self->domain_required = FALSE;
 
 	return;
 }
@@ -61,9 +67,24 @@
 	return;
 }
 
+/* Unlocks the memory before freeing */
+static void
+password_clear (gpointer data)
+{
+	char * pass = (char *)data;
+	munlock(pass, strlen(pass));
+	g_free(pass);
+	return;
+}
+
 static void
 citrix_server_finalize (GObject *object)
 {
+	CitrixServer * server = CITRIX_SERVER(object);
+
+	g_clear_pointer(&server->username, g_free);
+	g_clear_pointer(&server->password, password_clear);
+	g_clear_pointer(&server->domain, g_free);
 
 	G_OBJECT_CLASS (citrix_server_parent_class)->finalize (object);
 	return;
@@ -72,6 +93,8 @@
 static GVariant *
 get_properties (Server * server)
 {
+	CitrixServer * cserver = CITRIX_SERVER(server);
+
 	GVariantBuilder propbuilder;
 	g_variant_builder_init(&propbuilder, G_VARIANT_TYPE_ARRAY);
 
@@ -79,7 +102,11 @@
 	g_variant_builder_init(&namebuilder, G_VARIANT_TYPE_TUPLE);
 	g_variant_builder_add_value(&namebuilder, g_variant_new_string("username"));
 	g_variant_builder_add_value(&namebuilder, g_variant_new_boolean(TRUE));
-	g_variant_builder_add_value(&namebuilder, g_variant_new_variant(g_variant_new_string("")));
+	if (cserver->username == NULL) {
+		g_variant_builder_add_value(&namebuilder, g_variant_new_variant(g_variant_new_string("")));
+	} else {
+		g_variant_builder_add_value(&namebuilder, g_variant_new_variant(g_variant_new_string(cserver->username)));
+	}
 	g_variant_builder_add_value(&namebuilder, g_variant_parse(G_VARIANT_TYPE_VARDICT, "{}", NULL, NULL, NULL));
 	g_variant_builder_add_value(&propbuilder, g_variant_builder_end(&namebuilder));
 
@@ -87,15 +114,23 @@
 	g_variant_builder_init(&passbuilder, G_VARIANT_TYPE_TUPLE);
 	g_variant_builder_add_value(&passbuilder, g_variant_new_string("password"));
 	g_variant_builder_add_value(&passbuilder, g_variant_new_boolean(TRUE));
-	g_variant_builder_add_value(&passbuilder, g_variant_new_variant(g_variant_new_string("")));
+	if (cserver->password == NULL) {
+		g_variant_builder_add_value(&passbuilder, g_variant_new_variant(g_variant_new_string("")));
+	} else {
+		g_variant_builder_add_value(&passbuilder, g_variant_new_variant(g_variant_new_string(cserver->password)));
+	}
 	g_variant_builder_add_value(&passbuilder, g_variant_parse(G_VARIANT_TYPE_VARDICT, "{}", NULL, NULL, NULL));
 	g_variant_builder_add_value(&propbuilder, g_variant_builder_end(&passbuilder));
 
 	GVariantBuilder domainbuilder;
 	g_variant_builder_init(&domainbuilder, G_VARIANT_TYPE_TUPLE);
 	g_variant_builder_add_value(&domainbuilder, g_variant_new_string("domain"));
-	g_variant_builder_add_value(&domainbuilder, g_variant_new_boolean(TRUE));
-	g_variant_builder_add_value(&domainbuilder, g_variant_new_variant(g_variant_new_string("")));
+	g_variant_builder_add_value(&domainbuilder, g_variant_new_boolean(cserver->domain_required));
+	if (cserver->domain == NULL) {
+		g_variant_builder_add_value(&domainbuilder, g_variant_new_variant(g_variant_new_string("")));
+	} else {
+		g_variant_builder_add_value(&domainbuilder, g_variant_new_variant(g_variant_new_string(cserver->domain)));
+	}
 	g_variant_builder_add_value(&domainbuilder, g_variant_parse(G_VARIANT_TYPE_VARDICT, "{}", NULL, NULL, NULL));
 	g_variant_builder_add_value(&propbuilder, g_variant_builder_end(&domainbuilder));
 
@@ -148,5 +183,37 @@
 		}
 	}
 
+	if (json_object_has_member(object, JSON_USERNAME)) {
+		JsonNode * node = json_object_get_member(object, JSON_USERNAME);
+		if (JSON_NODE_TYPE(node) == JSON_NODE_VALUE && json_node_get_value_type(node) == G_TYPE_STRING) {
+			const gchar * username = json_node_get_string(node);
+			server->username = g_strdup(username);
+		}
+	}
+
+	if (json_object_has_member(object, JSON_PASSWORD)) {
+		JsonNode * node = json_object_get_member(object, JSON_PASSWORD);
+		if (JSON_NODE_TYPE(node) == JSON_NODE_VALUE && json_node_get_value_type(node) == G_TYPE_STRING) {
+			const gchar * password = json_node_get_string(node);
+			server->password = g_strdup(password);
+			mlock(server->password, strlen(server->password));
+		}
+	}
+
+	if (json_object_has_member(object, JSON_DOMAIN)) {
+		JsonNode * node = json_object_get_member(object, JSON_DOMAIN);
+		if (JSON_NODE_TYPE(node) == JSON_NODE_VALUE && json_node_get_value_type(node) == G_TYPE_STRING) {
+			const gchar * domain = json_node_get_string(node);
+			server->domain = g_strdup(domain);
+		}
+	}
+
+	if (json_object_has_member(object, JSON_DOMAIN_REQ)) {
+		JsonNode * node = json_object_get_member(object, JSON_DOMAIN_REQ);
+		if (JSON_NODE_TYPE(node) == JSON_NODE_VALUE && json_node_get_value_type(node) == G_TYPE_BOOLEAN) {
+			server->domain_required = json_node_get_boolean(node);
+		}
+	}
+
 	return SERVER(server);
 }

=== modified file 'src/citrix-server.h'
--- src/citrix-server.h	2012-08-16 18:44:58 +0000
+++ src/citrix-server.h	2012-09-10 21:37:19 +0000
@@ -41,6 +41,11 @@
 
 struct _CitrixServer {
 	Server parent;
+
+	gchar * username;
+	gchar * password;
+	gchar * domain;
+	gboolean domain_required;
 };
 
 GType citrix_server_get_type (void);

=== modified file 'src/defines.h'
--- src/defines.h	2012-08-29 19:09:54 +0000
+++ src/defines.h	2012-09-10 21:37:19 +0000
@@ -37,5 +37,7 @@
 #define JSON_URI             "URL"
 #define JSON_USERNAME        "Username"
 #define JSON_PASSWORD        "Password"
+#define JSON_DOMAIN_REQ      "DomainRequired"
+#define JSON_DOMAIN          "WindowsDomain"
 
 #endif /* __DEFINES_H__ */

=== modified file 'src/main.c'
--- src/main.c	2012-08-29 19:09:44 +0000
+++ src/main.c	2012-09-10 21:37:19 +0000
@@ -26,6 +26,8 @@
 #include "citrix-server.h"
 #include "uccs-server.h"
 
+gint server_list_to_array (GVariantBuilder * builder, GList * items);
+
 enum {
 	ERROR_SERVER_URI,
 	ERROR_LOGIN
@@ -44,8 +46,31 @@
 	return value;
 }
 
-static void
-find_config_file (GKeyFile * parsed, const gchar * cmnd_line)
+/* 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)
+{
+	GVariant * array = NULL;
+
+	GVariantBuilder builder;
+	g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
+
+	if (server_list_to_array(&builder, config_file_servers) > 0) {
+		array = g_variant_builder_end(&builder);
+	} else {
+		g_variant_builder_clear(&builder);
+		array = g_variant_new_array(G_VARIANT_TYPE("(sssba(sbva{sv})a(si))"), NULL, 0);
+	}
+
+	remote_login_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)
 {
 	GError * error = NULL;
 	const gchar * file = DEFAULT_CONFIG_FILE;
@@ -82,25 +107,37 @@
 			}
 
 			config_file_servers = g_list_append(config_file_servers, server);
+			g_signal_connect(server, SERVER_SIGNAL_STATE_CHANGED, G_CALLBACK(server_status_updated), rl);
 		}
 
 		g_strfreev(grouplist);
 	}
 
+	/* Signal the list of servers so that we're sure everyone's got them.  This is to
+	   solve a possible race where someone could ask while we're configuring these. */
+	server_status_updated(NULL, SERVER_STATE_ALLGOOD, rl);
 	return;
 }
 
-void
+gint
 server_list_to_array (GVariantBuilder * builder, GList * items)
 {
+	gint servercnt = 0;
 	GList * head = NULL;
 	for (head = items; head != NULL; head = g_list_next(head)) {
 		Server * server = SERVER(head->data);
+
+		/* We only want servers that are all good */
+		if (server->state != SERVER_STATE_ALLGOOD) {
+			continue;
+		}
+
+		servercnt++;
 		GVariant * variant = server_get_variant(server);
 		g_variant_builder_add_value(builder, variant);
 	}
 
-	return;
+	return servercnt;
 }
 
 static gboolean
@@ -108,14 +145,13 @@
 {
 	GVariant * array = NULL;
 
-	if (g_list_length(config_file_servers) > 0) {
-		GVariantBuilder builder;
-		g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
-
-		server_list_to_array(&builder, config_file_servers);
-
+	GVariantBuilder builder;
+	g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
+
+	if (server_list_to_array(&builder, config_file_servers) > 0) {
 		array = g_variant_builder_end(&builder);
 	} else {
+		g_variant_builder_clear(&builder);
 		array = g_variant_new_array(G_VARIANT_TYPE("(sssba(sbva{sv})a(si))"), NULL, 0);
 	}
 
@@ -279,7 +315,7 @@
 {
 	GMainLoop * mainloop = (GMainLoop *)user_data;
 
-	g_error("Unable to get name '%s'", name);
+	g_warning("Unable to get name '%s'.  Exiting.", name);
 	g_main_loop_quit(mainloop);
 
 	return;
@@ -313,9 +349,6 @@
 		return 1;
 	}
 
-	/* Parse config file */
-	find_config_file(config, cmnd_line_config);
-
 	/* Start up D' Bus */
 	GDBusConnection * session_bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL /* cancel */, &error);
 	if (error != NULL) {
@@ -324,7 +357,9 @@
 		return -1;
 	}
 
+	/* Build Dbus Interface */
 	RemoteLogin * skel = remote_login_skeleton_new();
+	/* Export it */
 	g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(skel),
 	                                 session_bus,
 	                                 "/com/canonical/RemoteLogin",
@@ -341,6 +376,9 @@
 	                             mainloop,
 	                             NULL); /* mainloop free */
 
+	/* Parse config file */
+	find_config_file(config, cmnd_line_config, skel);
+
 	/* Loop forever */
 	g_main_loop_run(mainloop);
 

=== modified file 'src/rdp-server.c'
--- src/rdp-server.c	2012-08-29 19:09:54 +0000
+++ src/rdp-server.c	2012-09-10 21:37:19 +0000
@@ -20,6 +20,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "rdp-server.h"
 #include "defines.h"
 
@@ -49,6 +51,10 @@
 static void
 rdp_server_init (RdpServer *self)
 {
+	self->username = NULL;
+	self->password = NULL;
+	self->domain = NULL;
+	self->domain_required = FALSE;
 
 	return;
 }
@@ -61,9 +67,24 @@
 	return;
 }
 
+/* Unlocks the memory before freeing */
+static void
+password_clear (gpointer data)
+{
+	char * pass = (char *)data;
+	munlock(pass, strlen(pass));
+	g_free(pass);
+	return;
+}
+
 static void
 rdp_server_finalize (GObject *object)
 {
+	RdpServer * server = RDP_SERVER(object);
+
+	g_clear_pointer(&server->username, g_free);
+	g_clear_pointer(&server->password, password_clear);
+	g_clear_pointer(&server->domain, g_free);
 
 	G_OBJECT_CLASS (rdp_server_parent_class)->finalize (object);
 	return;
@@ -72,6 +93,8 @@
 static GVariant *
 get_properties (Server * server)
 {
+	RdpServer * rserver = RDP_SERVER(server);
+
 	GVariantBuilder propbuilder;
 	g_variant_builder_init(&propbuilder, G_VARIANT_TYPE_ARRAY);
 
@@ -79,7 +102,11 @@
 	g_variant_builder_init(&namebuilder, G_VARIANT_TYPE_TUPLE);
 	g_variant_builder_add_value(&namebuilder, g_variant_new_string("username"));
 	g_variant_builder_add_value(&namebuilder, g_variant_new_boolean(TRUE));
-	g_variant_builder_add_value(&namebuilder, g_variant_new_variant(g_variant_new_string("")));
+	if (rserver->username == NULL) {
+		g_variant_builder_add_value(&namebuilder, g_variant_new_variant(g_variant_new_string("")));
+	} else {
+		g_variant_builder_add_value(&namebuilder, g_variant_new_variant(g_variant_new_string(rserver->username)));
+	}
 	g_variant_builder_add_value(&namebuilder, g_variant_parse(G_VARIANT_TYPE_VARDICT, "{}", NULL, NULL, NULL));
 	g_variant_builder_add_value(&propbuilder, g_variant_builder_end(&namebuilder));
 
@@ -87,15 +114,23 @@
 	g_variant_builder_init(&passbuilder, G_VARIANT_TYPE_TUPLE);
 	g_variant_builder_add_value(&passbuilder, g_variant_new_string("password"));
 	g_variant_builder_add_value(&passbuilder, g_variant_new_boolean(TRUE));
-	g_variant_builder_add_value(&passbuilder, g_variant_new_variant(g_variant_new_string("")));
+	if (rserver->password == NULL) {
+		g_variant_builder_add_value(&passbuilder, g_variant_new_variant(g_variant_new_string("")));
+	} else {
+		g_variant_builder_add_value(&passbuilder, g_variant_new_variant(g_variant_new_string(rserver->password)));
+	}
 	g_variant_builder_add_value(&passbuilder, g_variant_parse(G_VARIANT_TYPE_VARDICT, "{}", NULL, NULL, NULL));
 	g_variant_builder_add_value(&propbuilder, g_variant_builder_end(&passbuilder));
 
 	GVariantBuilder domainbuilder;
 	g_variant_builder_init(&domainbuilder, G_VARIANT_TYPE_TUPLE);
 	g_variant_builder_add_value(&domainbuilder, g_variant_new_string("domain"));
-	g_variant_builder_add_value(&domainbuilder, g_variant_new_boolean(TRUE));
-	g_variant_builder_add_value(&domainbuilder, g_variant_new_variant(g_variant_new_string("")));
+	g_variant_builder_add_value(&domainbuilder, g_variant_new_boolean(rserver->domain_required));
+	if (rserver->domain == NULL) {
+		g_variant_builder_add_value(&domainbuilder, g_variant_new_variant(g_variant_new_string("")));
+	} else {
+		g_variant_builder_add_value(&domainbuilder, g_variant_new_variant(g_variant_new_string(rserver->domain)));
+	}
 	g_variant_builder_add_value(&domainbuilder, g_variant_parse(G_VARIANT_TYPE_VARDICT, "{}", NULL, NULL, NULL));
 	g_variant_builder_add_value(&propbuilder, g_variant_builder_end(&domainbuilder));
 
@@ -148,5 +183,37 @@
 		}
 	}
 
+	if (json_object_has_member(object, JSON_USERNAME)) {
+		JsonNode * node = json_object_get_member(object, JSON_USERNAME);
+		if (JSON_NODE_TYPE(node) == JSON_NODE_VALUE && json_node_get_value_type(node) == G_TYPE_STRING) {
+			const gchar * username = json_node_get_string(node);
+			server->username = g_strdup(username);
+		}
+	}
+
+	if (json_object_has_member(object, JSON_PASSWORD)) {
+		JsonNode * node = json_object_get_member(object, JSON_PASSWORD);
+		if (JSON_NODE_TYPE(node) == JSON_NODE_VALUE && json_node_get_value_type(node) == G_TYPE_STRING) {
+			const gchar * password = json_node_get_string(node);
+			server->password = g_strdup(password);
+			mlock(server->password, strlen(server->password));
+		}
+	}
+
+	if (json_object_has_member(object, JSON_DOMAIN)) {
+		JsonNode * node = json_object_get_member(object, JSON_DOMAIN);
+		if (JSON_NODE_TYPE(node) == JSON_NODE_VALUE && json_node_get_value_type(node) == G_TYPE_STRING) {
+			const gchar * domain = json_node_get_string(node);
+			server->domain = g_strdup(domain);
+		}
+	}
+
+	if (json_object_has_member(object, JSON_DOMAIN_REQ)) {
+		JsonNode * node = json_object_get_member(object, JSON_DOMAIN_REQ);
+		if (JSON_NODE_TYPE(node) == JSON_NODE_VALUE && json_node_get_value_type(node) == G_TYPE_BOOLEAN) {
+			server->domain_required = json_node_get_boolean(node);
+		}
+	}
+
 	return SERVER(server);
 }

=== modified file 'src/rdp-server.h'
--- src/rdp-server.h	2012-08-16 18:44:58 +0000
+++ src/rdp-server.h	2012-09-10 21:37:19 +0000
@@ -41,6 +41,11 @@
 
 struct _RdpServer {
 	Server parent;
+
+	gchar * username;
+	gchar * password;
+	gchar * domain;
+	gboolean domain_required;
 };
 
 GType rdp_server_get_type (void);

=== modified file 'src/server.c'
--- src/server.c	2012-08-29 18:49:21 +0000
+++ src/server.c	2012-09-10 21:37:19 +0000
@@ -31,8 +31,16 @@
 static void server_dispose    (GObject *object);
 static void server_finalize   (GObject *object);
 
+/* Signals */
+enum {
+	STATE_CHANGED,
+	LAST_SIGNAL
+};
+
 G_DEFINE_TYPE (Server, server, G_TYPE_OBJECT);
 
+static guint signals[LAST_SIGNAL] = { 0 };
+
 static void
 server_class_init (ServerClass *klass)
 {
@@ -41,6 +49,14 @@
 	object_class->dispose = server_dispose;
 	object_class->finalize = server_finalize;
 
+	signals[STATE_CHANGED] = g_signal_new(SERVER_SIGNAL_STATE_CHANGED,
+	                                      G_TYPE_FROM_CLASS(klass),
+	                                      G_SIGNAL_RUN_LAST,
+	                                      G_STRUCT_OFFSET(ServerClass, state_changed),
+	                                      NULL, NULL,
+	                                      g_cclosure_marshal_VOID__INT,
+	                                      G_TYPE_NONE, 1, G_TYPE_INT, G_TYPE_NONE);
+
 	return;
 }
 
@@ -50,6 +66,7 @@
 	self->name = NULL;
 	self->uri = NULL;
 	self->last_used = FALSE;
+	self->state = SERVER_STATE_ALLGOOD;
 
 	return;
 }

=== modified file 'src/server.h'
--- src/server.h	2012-08-29 18:34:04 +0000
+++ src/server.h	2012-09-10 21:37:19 +0000
@@ -31,8 +31,16 @@
 #define IS_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SERVER_TYPE))
 #define SERVER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), SERVER_TYPE, ServerClass))
 
+#define SERVER_SIGNAL_STATE_CHANGED  "state-changed"
+
 typedef struct _Server      Server;
 typedef struct _ServerClass ServerClass;
+typedef enum   _ServerState ServerState;
+
+enum _ServerState {
+	SERVER_STATE_ALLGOOD,
+	SERVER_STATE_UNAVAILABLE
+};
 
 struct _ServerClass {
 	GObjectClass parent_class;
@@ -40,6 +48,9 @@
 	GVariant * (*get_applications) (Server * server);
 	GVariant * (*get_domains) (Server * server);
 	Server * (*find_uri) (Server * server, const gchar * uri);
+
+	/* signals */
+	void (*state_changed) (Server * server, ServerState newstate, gpointer user_data);
 };
 
 struct _Server {
@@ -48,6 +59,8 @@
 	gchar * name;
 	gchar * uri;
 	gboolean last_used;
+
+	ServerState state;
 };
 
 GType server_get_type (void);

=== modified file 'src/uccs-server.c'
--- src/uccs-server.c	2012-08-29 19:09:54 +0000
+++ src/uccs-server.c	2012-09-10 21:37:19 +0000
@@ -90,6 +90,10 @@
 	self->json_stream = NULL;
 	self->pass_stream = NULL;
 
+	if (self->exec == NULL) {
+		self->parent.state = SERVER_STATE_UNAVAILABLE;
+	}
+
 	return;
 }
 
@@ -234,6 +238,33 @@
 	return g_variant_builder_end(&propbuilder);
 }
 
+/* Set the exec value for the server */
+const gchar *
+uccs_server_set_exec (UccsServer * server, const gchar * exec)
+{
+	g_return_val_if_fail(IS_UCCS_SERVER(server), NULL);
+
+	g_clear_pointer(&server->exec, g_free);
+
+	if (exec != NULL) {
+		server->exec = g_find_program_in_path(exec);
+	}
+
+	ServerState oldstate = server->parent.state;
+	if (server->exec != NULL) {
+		server->parent.state = SERVER_STATE_ALLGOOD;
+	} else {
+		server->parent.state = SERVER_STATE_UNAVAILABLE;
+	}
+
+	if (server->parent.state != oldstate) {
+		g_signal_emit_by_name(server, SERVER_SIGNAL_STATE_CHANGED, server->parent.state);
+	}
+
+	return server->exec;
+}
+
+/* Build a new uccs server from a keyfile and a group in it */
 Server *
 uccs_server_new_from_keyfile (GKeyFile * keyfile, const gchar * groupname)
 {
@@ -256,9 +287,8 @@
 	}
 
 	if (g_key_file_has_key(keyfile, groupname, CONFIG_UCCS_EXEC, NULL)) {
-		g_free(server->exec);
 		gchar * key = g_key_file_get_string(keyfile, groupname, CONFIG_UCCS_EXEC, NULL);
-		server->exec = g_find_program_in_path(key);
+		uccs_server_set_exec(server, key);
 		g_free(key);
 	}
 
@@ -572,18 +602,27 @@
 		return null_server_array();
 	}
 
-	if (g_list_length(server->subservers) == 0) {
-		return null_server_array();
-	}
-
 	GVariantBuilder array;
 	g_variant_builder_init(&array, G_VARIANT_TYPE_ARRAY);
 	GList * lserver;
+	gint servercnt = 0;
 	for (lserver = server->subservers; lserver != NULL; lserver = g_list_next(lserver)) {
 		Server * serv = SERVER(lserver->data);
+
+		/* We only want servers that are all good */
+		if (serv->state != SERVER_STATE_ALLGOOD) {
+			continue;
+		}
+
+		servercnt++;
 		g_variant_builder_add_value(&array, server_get_variant(serv));
 	}
 
+	if (servercnt == 0) {
+		g_variant_builder_clear(&array);
+		return null_server_array();
+	}
+
 	return g_variant_builder_end(&array);
 }
 

=== modified file 'tests/dbus-interface.c'
--- tests/dbus-interface.c	2012-08-27 15:45:46 +0000
+++ tests/dbus-interface.c	2012-09-10 21:37:19 +0000
@@ -16,28 +16,31 @@
 	const gchar * name;
 	const gchar * uri;
 	const gchar * type;
-	/* TODO: Add more as we get more working */
+	const gchar * username;
+	const gchar * password;
+	const gchar * domain;
 };
 
 slmock_server_t citrix_server_table[] = {
-	{"Citrix USA", "107.21.17.35", "ica"},
-	{"Citrix 2",   "107.21.17.35", "ica"},
-	{"Citrix 3",   "107.21.17.35", "ica"},
+	{"Citrix USA", "107.21.17.35", "ica", "useradmin1", "", "IP-0A00001E"},
+	{"Citrix 2",   "107.21.17.35", "ica", "useradmin2", "", "IP-0A00001E"},
+	{"Citrix 3",   "107.21.17.35", "ica", "useradmin3", "", "IP-0A00001E"},
+	{"Citrix 4",   "107.21.17.35", "ica", "useradmin4", "userpass", "IP-0A00001E"},
 	{NULL, NULL, NULL}
 };
 
 slmock_server_t freerdp_server_table[] = {
-	{"FreeRDP US",    "23.21.151.133",  "freerdp"},
-	{"FreeRDP Asia",  "46.137.222.181", "freerdp"},
-	{"FreeRDP UK",    "46.137.189.194", "freerdp"},
+	{"FreeRDP US",    "23.21.151.133",  "freerdp", "Administrator", "", ""},
+	{"FreeRDP Asia",  "46.137.222.181", "freerdp", "Administrator", "", ""},
+	{"FreeRDP UK",    "46.137.189.194", "freerdp", "Administrator", "", ""},
 	{NULL, NULL, NULL}
 };
 
 slmock_server_t big_server_table[] = {
-	{"XenServer",    "107.21.17.35",    "ica"},
-	{"Citrix2",      "http://1.2.3.4",  "ica"},
-	{"Accenture",    "10.21.17.35",     "freerdp"},
-	{"Accenture 2",  "https://4.5.6.7", "freerdp"},
+	{"XenServer",    "107.21.17.35",    "ica",     "",         "",             "ASIA"},
+	{"Citrix2",      "http://1.2.3.4",  "ica",     "fakeuser", "fakepassword", "DOMAIN1"},
+	{"Accenture",    "10.21.17.35",     "freerdp", "fakeuser", "",             "EUROPE"},
+	{"Accenture 2",  "https://4.5.6.7", "freerdp", "",         "",             "domain2"},
 	{NULL, NULL, NULL}
 };
 
@@ -79,8 +82,47 @@
 			continue;
 		}
 
+		gboolean match_username = FALSE;
+		gboolean match_password = FALSE;
+		gboolean match_domain = FALSE;
+
+		GVariant * props = g_variant_get_child_value(child, 4);
+		int iprop;
+		for (iprop = 0; iprop < g_variant_n_children(props); iprop++) {
+			GVariant * prop = g_variant_get_child_value(props, iprop);
+
+			GVariant * prop_type = g_variant_get_child_value(prop, 0);
+			GVariant * prop_value_wrap = g_variant_get_child_value(prop, 2);
+			GVariant * prop_value = g_variant_get_variant(prop_value_wrap);
+
+			if (g_strcmp0(g_variant_get_string(prop_type, NULL), "username") == 0) {
+				if (g_strcmp0(g_variant_get_string(prop_value, NULL), server->username) == 0) {
+					match_username = TRUE;
+				}
+			} else if (g_strcmp0(g_variant_get_string(prop_type, NULL), "password") == 0) {
+				if (g_strcmp0(g_variant_get_string(prop_value, NULL), server->password) == 0) {
+					match_password = TRUE;
+				}
+			} else if (g_strcmp0(g_variant_get_string(prop_type, NULL), "domain") == 0) {
+				if (g_strcmp0(g_variant_get_string(prop_value, NULL), server->domain) == 0) {
+					match_domain = TRUE;
+				}
+			}
+
+			g_variant_unref(prop_value);
+			g_variant_unref(prop_value_wrap);
+			g_variant_unref(prop_type);
+			g_variant_unref(prop);
+		}
+		g_variant_unref(props);
+
 		g_variant_unref(child);
-		return TRUE;
+
+		if (match_username && match_password && match_domain) {
+			return TRUE;
+		} else {
+			continue;
+		}
 	}
 
 	return FALSE;

=== modified file 'tests/server-test.c'
--- tests/server-test.c	2012-08-29 19:44:17 +0000
+++ tests/server-test.c	2012-09-10 21:37:19 +0000
@@ -7,6 +7,48 @@
 #include "uccs-server.h"
 
 static void
+state_signal (Server * server, ServerState newstate, gboolean * signaled)
+{
+	*signaled = TRUE;
+	return;
+}
+
+static void
+test_update_signal (void)
+{
+	GKeyFile * keyfile = g_key_file_new();
+	const gchar * groupname = CONFIG_SERVER_PREFIX " Server Name";
+	g_key_file_set_string(keyfile, groupname, CONFIG_SERVER_NAME, "My Server");
+	g_key_file_set_string(keyfile, groupname, CONFIG_SERVER_URI,  "http://my.domain.com");
+
+	Server * server = NULL;
+	server = server_new_from_keyfile(keyfile, groupname);
+	g_assert(server != NULL);
+	g_assert(g_strcmp0(server->name, "My Server") == 0);
+	g_assert(g_strcmp0(server->uri, "http://my.domain.com") == 0);
+
+	UccsServer * userver = UCCS_SERVER(server);
+	g_assert(userver != NULL);
+
+	gboolean signaled = FALSE;
+	g_signal_connect(G_OBJECT(server), SERVER_SIGNAL_STATE_CHANGED, G_CALLBACK(state_signal), &signaled);
+
+	if (server->state == SERVER_STATE_ALLGOOD) {
+		signaled = FALSE;
+		uccs_server_set_exec(userver, "thisshouldnotexist");
+		g_assert(signaled);
+		g_assert(server->state == SERVER_STATE_UNAVAILABLE);
+	}
+
+	signaled = FALSE;
+	uccs_server_set_exec(userver, "ls");
+	g_assert(signaled);
+	g_assert(server->state == SERVER_STATE_ALLGOOD);
+
+	return;
+}
+
+static void
 test_uccs_domains (void)
 {
 	GKeyFile * keyfile = g_key_file_new();
@@ -199,6 +241,7 @@
 
 	g_test_add_func ("/server/uccs/exec",     test_uccs_exec);
 	g_test_add_func ("/server/uccs/domains",  test_uccs_domains);
+	g_test_add_func ("/server/uccs/signal",   test_update_signal);
 
 	return;
 }

=== modified file 'tests/slmock'
--- tests/slmock	2012-08-21 15:46:54 +0000
+++ tests/slmock	2012-09-10 21:37:19 +0000
@@ -93,7 +93,7 @@
     ts3 = TerminalServer("107.21.17.35", "Citrix 3", "ICA", True,
         "useradmin3")
     ts4 = TerminalServer("107.21.17.35", "Citrix 4", "ICA", True,
-        "useradmin4")
+        "useradmin4", "userpass")
     ts1.add_domain("IP-0A00001E")
     ts2.add_domain("IP-0A00001E")
     ts3.add_domain("IP-0A00001E")