Merge lp:~ted/remote-login-service/ubuntu-cve into lp:~ubuntu-desktop/remote-login-service/ubuntu

[Ted Gould]

Fix a bug, a security one at that.

[Sebastien Bacher (seb128)]

Setting as merged, it's included in http://bazaar.launchpad.net/~ubuntu-desktop/remote-login-service/ubuntu/revision/21

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-03 21:31:01 +0000
+++ debian/changelog	2012-10-24 16:38:06 +0000
@@ -1,3 +1,9 @@
+remote-login-service (1.0.0-0ubuntu2) quantal; urgency=low
+
+  * 01_clear_servers.patch: Clear servers on second login (LP: #1070896)
+
+ -- Ted Gould <[e-mail]>  Wed, 24 Oct 2012 18:35:36 +0200
+
 remote-login-service (1.0.0-0ubuntu1) quantal; urgency=low
 
   * New upstream release.

=== added directory 'debian/patches'
=== added file 'debian/patches/01_clear_servers.patch'
--- debian/patches/01_clear_servers.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_clear_servers.patch	2012-10-24 16:38:06 +0000
@@ -0,0 +1,32 @@
+=== modified file 'src/uccs-server.c'
+--- old/src/uccs-server.c	2012-09-17 07:49:30 +0000
++++ new/src/uccs-server.c	2012-10-24 14:35:36 +0000
+@@ -466,6 +466,10 @@
+ static gboolean
+ parse_rds_array (UccsServer * server, JsonArray * array)
+ {
++	// Got a new set of servers, delete the old one
++	g_list_free_full(server->subservers, g_object_unref);
++	server->subservers = NULL; 
++
+ 	int i;
+ 	for (i = 0; i < json_array_get_length(array); i++) {
+ 		JsonNode * node = json_array_get_element(array, i);
+
+=== modified file 'tests/dbus-interface.c'
+--- old/tests/dbus-interface.c	2012-09-17 07:49:30 +0000
++++ new/tests/dbus-interface.c	2012-10-24 14:35:36 +0000
+@@ -184,9 +184,12 @@
+ 
+ 	GVariant * array = g_variant_get_child_value(retval, 2);
+ 	int i;
++	// Check all servers should be in the result are in the result
+ 	for (i = 0; slmockdata->servers[i].name != NULL; i++) {
+ 		g_assert(find_server(array, &slmockdata->servers[i]));
+ 	}
++	// Check there is no more servers in the result than we expected
++	g_assert(i == g_variant_n_children(array));
+ 	g_variant_unref(array);
+ 
+ 	g_variant_unref(retval);
+

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-10-24 16:38:06 +0000
@@ -0,0 +1,1 @@
+01_clear_servers.patch