xserver: Branch 'master'

[GitLab Mirror]

 os/auth.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a026972776b303fa640f54e5e8f0fc1abf879071
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Mon Mar 16 15:43:07 2015 +0000

    Clarify authorization failure reason strings sent back to the client

diff --git a/os/auth.c b/os/auth.c
index d3254349d..611e4efb1 100644
--- a/os/auth.c
+++ b/os/auth.c
@@ -215,11 +215,11 @@ CheckAuthorization(unsigned int name_length,
                 return (*protocols[i].Check) (data_length, data, client,
                                               reason);
             }
-            *reason = "Protocol not supported by server\n";
+            *reason = "Authorization protocol not supported by server\n";
         }
     }
     else
-        *reason = "No protocol specified\n";
+        *reason = "Authorization required, but no authorization protocol specified\n";
     return (XID) ~0L;
 }