Merge lp:~robert-ancell/lightdm/handle-corrupt-xauthority into lp:lightdm

[Robert Ancell]

Don't fail writing X authority if reading it had an error

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[Till Kamppeter (till-kamppeter)]

I have tested this patch and it fixes bug 1228570.

=== modified file 'src/x-authority.c'
--- src/x-authority.c	2013-09-10 23:14:12 +0000
+++ src/x-authority.c	2013-09-30 03:00:01 +0000
@@ -237,7 +237,7 @@
 gboolean
 x_authority_write (XAuthority *auth, XAuthWriteMode mode, const gchar *filename, GError **error)
 {
-    gchar *input;
+    gchar *input = NULL;
     gsize input_length = 0, input_offset = 0;
     GList *link, *records = NULL;
     XAuthority *a;
@@ -328,6 +328,7 @@
     }
 
     errno = 0;
+    result = TRUE;
     for (link = records; link && result; link = link->next)
     {
         XAuthority *a = link->data;