From 8cdc9d4fbcf217b1cd2da157e682bcf26944b484 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 4 Oct 2010 09:13:13 -0400 Subject: [PATCH] - Resolves: rhbz#626205 - Unable to unlock screen --- 0002-Return-offline-instead-of-error.patch | 31 ++++++++++++++++++++++ sssd.spec | 7 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0002-Return-offline-instead-of-error.patch diff --git a/0002-Return-offline-instead-of-error.patch b/0002-Return-offline-instead-of-error.patch new file mode 100644 index 0000000..44ce53d --- /dev/null +++ b/0002-Return-offline-instead-of-error.patch @@ -0,0 +1,31 @@ +From f1e22670eaaa7c881593924896acc84ecc131872 Mon Sep 17 00:00:00 2001 +From: Stephen Gallagher +Date: Fri, 1 Oct 2010 12:34:54 -0400 +Subject: [PATCH] Return offline instead of error + +When the failover code returns that there are no available servers +while we are marked offline, we were returning an error to the PAM +authentication code. Instead, we should return success with a +result value of SDAP_UNAVAIL so that the PAM responder will mark +the domain offline and attempt offline authentication. +--- + src/providers/ldap/ldap_auth.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/src/providers/ldap/ldap_auth.c b/src/providers/ldap/ldap_auth.c +index d01449262c39865ffc4916c8d7dd8b6874cd4a02..0ea86f3e34db0cd5bab83ecff80859f495b234e2 100644 +--- a/src/providers/ldap/ldap_auth.c ++++ b/src/providers/ldap/ldap_auth.c +@@ -567,7 +567,8 @@ static void auth_resolve_done(struct tevent_req *subreq) + if (ret) { + /* all servers have been tried and none + * was found good, go offline */ +- tevent_req_error(req, EIO); ++ state->result = SDAP_UNAVAIL; ++ tevent_req_done(req); + return; + } + +-- +1.7.2.3 + diff --git a/sssd.spec b/sssd.spec index 36b6d6d..a07ffea 100644 --- a/sssd.spec +++ b/sssd.spec @@ -7,7 +7,7 @@ Name: sssd Version: 1.3.0 #Never reset the Release, always increment it #Otherwise we can have issues if library versions do not change -Release: 32%{?dist} +Release: 33%{?dist} Group: Applications/System Summary: System Security Services Daemon License: GPLv3+ @@ -23,6 +23,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ### Patches ### Patch0001: 0001-Treat-a-zero-length-password-as-a-failure.patch +Patch0002: 0002-Return-offline-instead-of-error.patch ### Dependencies ### @@ -204,6 +205,7 @@ A dynamically-growing, reference-counted array %prep %setup -q %patch0001 -p1 +%patch0002 -p1 %build %configure \ @@ -457,6 +459,9 @@ fi %postun -n libref_array -p /sbin/ldconfig %changelog +* Fri Oct 01 2010 Stephen Gallagher - 1.3.0-33 +- Resolves: rhbz#626205 - Unable to unlock screen + * Tue Sep 28 2010 Stephen Gallagher - 1.3.0-32 - Resolves: rhbz#637955 - libini_config-devel needs libcollection-devel but - doesn't require it