From b887d840a625374d62b547e93cde984d1dc17348 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sep 18 2023 13:21:15 +0000
Subject: Backport fix for Authfile parsing regression


---

diff --git a/0002-Server-Fix-incorrect-patch-for-authfile-that-made-5..patch b/0002-Server-Fix-incorrect-patch-for-authfile-that-made-5..patch
new file mode 100644
index 0000000..7d0a3fb
--- /dev/null
+++ b/0002-Server-Fix-incorrect-patch-for-authfile-that-made-5..patch
@@ -0,0 +1,27 @@
+From d5f600834da7fbbb47477a7267609eefc74f8033 Mon Sep 17 00:00:00 2001
+From: Andrew Hanushevsky <abh@stanford.edu>
+Date: Mon, 18 Sep 2023 00:39:29 -0700
+Subject: [PATCH 2/2] [Server] Fix incorrect patch for authfile that made 5.6.2
+ fail.
+
+Fixes: #2088, 478ad4b4.
+---
+ src/XrdAcc/XrdAccAuthFile.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/XrdAcc/XrdAccAuthFile.cc b/src/XrdAcc/XrdAccAuthFile.cc
+index 1f4c45477..8b738baa7 100644
+--- a/src/XrdAcc/XrdAccAuthFile.cc
++++ b/src/XrdAcc/XrdAccAuthFile.cc
+@@ -161,7 +161,7 @@ char XrdAccAuthFile::getID(char **id)
+ // two character specification but only validate the first to be backward
+ // compatible.
+ //
+-   if (strlen(pp) <= 2 || !index("ghoru", *pp))
++   if (strlen(pp) > 2 || !index("ghoru", *pp))
+       {Eroute->Emsg("AuthFile", "Invalid ID sprecifier -", pp);
+        flags = (DBflags)(flags | dbError);
+        return 0;
+-- 
+2.41.0
+
diff --git a/xrootd.spec b/xrootd.spec
index a6cdb5b..40a5931 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -14,7 +14,7 @@
 Name:		xrootd
 Epoch:		1
 Version:	5.6.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Extended ROOT file server
 License:	LGPL-3.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND curl AND MIT AND Zlib
 URL:		https://xrootd.slac.stanford.edu/
@@ -22,6 +22,8 @@ Source0:	https://xrootd.slac.stanford.edu/download/v%{version}/%{name}-%{version
 
 #		https://github.com/xrootd/xrootd/pull/2087
 Patch0:		0001-Fix-spelling-errors-reported-by-lintian.patch
+#		https://github.com/xrootd/xrootd/issues/2088
+Patch1:		0002-Server-Fix-incorrect-patch-for-authfile-that-made-5..patch
 
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	cmake3
@@ -298,6 +300,7 @@ This package contains the API documentation of the xrootd libraries.
 %prep
 %setup -q
 %patch -P 0 -p1
+%patch -P 1 -p1
 
 %build
 %if %{?rhel}%{!?rhel:0} == 7
@@ -695,6 +698,9 @@ fi
 %doc %{_pkgdocdir}
 
 %changelog
+* Mon Sep 18 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.6.2-2
+- Backport fix for Authfile parsing regression
+
 * Fri Sep 15 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.6.2-1
 - Update to version 5.6.2