[sssd/f13/master] Fix incorrect error code from chpass operations

[Stephen Gallagher]

commit 67030b4f385185871dff4cb3bb44d0fbe7492b9b
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Wed Aug 11 16:43:01 2010 -0400

    Fix incorrect error code from chpass operations

 ...-Fix-chpass-operations-with-LDAP-provider.patch |   28 ++++++++++++++++++++
 sssd.spec                                          |    8 +++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-chpass-operations-with-LDAP-provider.patch b/0001-Fix-chpass-operations-with-LDAP-provider.patch
new file mode 100644
index 0000000..d56650f
--- /dev/null
+++ b/0001-Fix-chpass-operations-with-LDAP-provider.patch
@@ -0,0 +1,28 @@
+From 5618e8d8c614166386cfd872c7fedc76c4bc579a Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh at redhat.com>
+Date: Wed, 4 Aug 2010 13:42:06 -0400
+Subject: [PATCH 8/8] Fix chpass operations with LDAP provider
+
+The initial verification of the old password was returning an
+error because we were not explicitly setting dp_err to
+DP_ERR_SUCCESS and it was initialized earlier in the function to
+DP_ERR_FATAL.
+---
+ src/providers/ldap/ldap_auth.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/providers/ldap/ldap_auth.c b/src/providers/ldap/ldap_auth.c
+index 63719c0730707b1718dd36b9f5db76f1f3f8aebe..b05e3075ce117fad17b87ffde257c80fc035b8c4 100644
+--- a/src/providers/ldap/ldap_auth.c
++++ b/src/providers/ldap/ldap_auth.c
+@@ -865,6 +865,7 @@ static void sdap_auth4chpass_done(struct tevent_req *req)
+         DEBUG(9, ("Initial authentication for change password operation "
+                   "successful.\n"));
+         state->pd->pam_status = PAM_SUCCESS;
++        dp_err = DP_ERR_OK;
+         goto done;
+     }
+ 
+-- 
+1.7.2
+
diff --git a/sssd.spec b/sssd.spec
index f8677a5..c52b620 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -7,7 +7,7 @@ Name: sssd
 Version: 1.2.2
 #Never reset the Release, always increment it
 #Otherwise we can have issues if library versions do not change
-Release: 19%{?dist}
+Release: 20%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 License: GPLv3+
@@ -22,6 +22,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 %global refarray_version 0.1.0
 
 ### Patches ###
+Patch0001: 0001-Fix-chpass-operations-with-LDAP-provider.patch
 
 ### Dependencies ###
 
@@ -201,6 +202,8 @@ A dynamically-growing, reference-counted array
 %prep
 %setup -q
 
+%patch0001 -p1
+
 %build
 %configure \
     --with-db-path=%{dbpath} \
@@ -459,6 +462,9 @@ fi
 %postun -n libref_array -p /sbin/ldconfig
 
 %changelog
+* Wed Aug 04 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.2.2-20
+- Resolves: rhbz#621307 - Password changes are broken on LDAP
+
 * Tue Aug 03 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.2.2-19
 - Resolves: rhbz#606887 - sssd stops on upgrade