From 602fa2c3ef0d088b7b834e9d2ebb306d104a79ce Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Thu, 5 Aug 2010 08:43:49 -0400
Subject: Properly handle errors from a password change operation

---
 src/providers/ldap/sdap_async.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'src/providers')

diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c
index 0f260242c..cd61a2214 100644
--- a/src/providers/ldap/sdap_async.c
+++ b/src/providers/ldap/sdap_async.c
@@ -576,22 +576,28 @@ static void sdap_exop_modify_passwd_done(struct sdap_op *op,
         }
     }
 
+    DEBUG(3, ("ldap_extended_operation result: %s(%d), %s\n",
+              ldap_err2string(state->result), state->result, errmsg));
+
     if (state->result != LDAP_SUCCESS) {
-        state->user_error_message = talloc_strdup(state, errmsg);
-        if (state->user_error_message == NULL) {
-            DEBUG(1, ("talloc_strdup failed.\n"));
+        if (errmsg) {
+            state->user_error_message = talloc_strdup(state, errmsg);
+            if (state->user_error_message == NULL) {
+                DEBUG(1, ("talloc_strdup failed.\n"));
+                ret = ENOMEM;
+                goto done;
+            }
         }
+        ret = EIO;
+        goto done;
     }
 
-    DEBUG(3, ("ldap_extended_operation result: %s(%d), %s\n",
-              ldap_err2string(state->result), state->result, errmsg));
-
-    ret = LDAP_SUCCESS;
+    ret = EOK;
 done:
     ldap_controls_free(response_controls);
     ldap_memfree(errmsg);
 
-    if (ret == LDAP_SUCCESS) {
+    if (ret == EOK) {
         tevent_req_done(req);
     } else {
         tevent_req_error(req, ret);
-- 
cgit