[xorg-x11-server] fix regression in SI:localuser handling

[Dave Airlie]

commit 86378729500f4bf9f32cdc0d2847ab6e247ae258
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Feb 17 14:45:22 2015 +1000

    fix regression in SI:localuser handling

 ...fix-regression-in-server-interpreted-auth.patch |   34 ++++++++++++++++++++
 xorg-x11-server.spec                               |    8 ++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/0001-os-access-fix-regression-in-server-interpreted-auth.patch b/0001-os-access-fix-regression-in-server-interpreted-auth.patch
new file mode 100644
index 0000000..57bc703
--- /dev/null
+++ b/0001-os-access-fix-regression-in-server-interpreted-auth.patch
@@ -0,0 +1,34 @@
+From 6b617438442aee010ae69e1134b5a6f34cbdc9fd Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Tue, 17 Feb 2015 14:38:21 +1000
+Subject: [PATCH] os/access: fix regression in server interpreted auth
+
+This was reported on irc on Fedora when rawhide went to 1.17.1.
+
+regression occured in: 2566835b4374edb3e5a8353d4f7c9e7ec4851c57
+ os: Eliminate uninitialized value warnings from access.c
+
+siAddrMatch doesn't need addr to be a useful value, it checks
+some things like localuser without having an address at all.
+
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
+ os/access.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/os/access.c b/os/access.c
+index 28f2d32..8fa028e 100644
+--- a/os/access.c
++++ b/os/access.c
+@@ -1392,7 +1392,7 @@ InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client)
+     }
+     for (host = validhosts; host; host = host->next) {
+         if (host->family == FamilyServerInterpreted) {
+-            if (addr && siAddrMatch(family, addr, len, host, client)) {
++            if (siAddrMatch(family, addr, len, host, client)) {
+                 return 0;
+             }
+         }
+-- 
+1.9.3
+
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 522a601..96bab34 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -42,7 +42,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.17.1
-Release:   1%{?gitdate:.%{gitdate}}%{dist}
+Release:   2%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -93,6 +93,9 @@ Patch7027: xserver-autobind-hotplug.patch
 # submitted: http://lists.x.org/archives/xorg-devel/2013-October/037996.html
 Patch9100: exa-only-draw-valid-trapezoids.patch
 
+# submitted upstream: regression in 1.17.0
+Patch9200: 0001-os-access-fix-regression-in-server-interpreted-auth.patch
+
 # because the display-managers are not ready yet, do not upstream
 Patch10000: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch
 
@@ -632,6 +635,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Tue Feb 17 2015 Dave Airlie <airlied at redhat.com> 1.17.1-2
+- fix regression in SI:localuser handling
+
 * Wed Feb 11 2015 Hans de Goede <hdegoede at redhat.com> - 1.17.1-1
 - New upstream release 1.17.1 (rhbz#1144404)
 - xorg-x11-drv-modesetting is now included in xorg-x11-server-Xorg,