[prev in list] [next in list] [prev in thread] [next in thread] 

List:       sssd-devel
Subject:    [PATCH 3/4] IPA: Check return values
From:       jhrozek () redhat ! com (Jakub Hrozek)
Date:       2012-04-26 9:21:59
Message-ID: mailman.10.1336033384.4463.sssd-devel () lists ! fedorahosted ! org
[Download RAW message or body]

---
 src/providers/ipa/ipa_common.c |    8 ++++++--
 src/providers/ipa/ipa_hosts.c  |    6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c
index 225c9786c47ffe4895ad24a77b1cb23550839e48..262a9bccc1c9f113202a60f5ba551018d3d07f7f 100644
--- a/src/providers/ipa/ipa_common.c
+++ b/src/providers/ipa/ipa_common.c
@@ -916,6 +916,10 @@ int ipa_get_autofs_options(struct ipa_options *ipa_opts,
     ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic,
                                  SDAP_AUTOFS_SEARCH_BASE,
                                  &ipa_opts->id->autofs_search_bases);
+    if (ret != EOK && ret != ENOENT) {
+        DEBUG(SSSDBG_OP_FAILURE, ("Could not parse autofs search base\n"));
+        goto done;
+    }
 
     ret = sdap_get_map(ipa_opts->id, cdb, conf_path,
                        ipa_autofs_mobject_map,
@@ -924,7 +928,7 @@ int ipa_get_autofs_options(struct ipa_options *ipa_opts,
     if (ret != EOK) {
         DEBUG(SSSDBG_OP_FAILURE,
               ("Could not get autofs map object attribute map\n"));
-        return ret;
+        goto done;
     }
 
     ret = sdap_get_map(ipa_opts->id, cdb, conf_path,
@@ -934,7 +938,7 @@ int ipa_get_autofs_options(struct ipa_options *ipa_opts,
     if (ret != EOK) {
         DEBUG(SSSDBG_OP_FAILURE,
               ("Could not get autofs entry object attribute map\n"));
-        return ret;
+        goto done;
     }
 
     *_opts = ipa_opts->id;
diff --git a/src/providers/ipa/ipa_hosts.c b/src/providers/ipa/ipa_hosts.c
index 5252ac9b4de33862d5526e23b10fe14df8e5bc8a..300138648f3029a6d94e60ade6e6c00977618f66 100644
--- a/src/providers/ipa/ipa_hosts.c
+++ b/src/providers/ipa/ipa_hosts.c
@@ -332,6 +332,12 @@ ipa_hostgroup_info_done(struct tevent_req *subreq)
                                     &hostgroup_count,
                                     &hostgroups);
         talloc_zfree(subreq);
+        if (ret != EOK) {
+            DEBUG(SSSDBG_OP_FAILURE,
+                  ("sdap_get_generic_recv failed: [%d]\n", ret));
+            tevent_req_error(req, ret);
+            return;
+        }
 
         /* Merge the two arrays */
         if (hostgroup_count > 0) {
-- 
1.7.7.6


--x+6KMIRAuhnl3hBn
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="0004-AUTOFS-remove-unused-assignments.patch"


[prev in list] [next in list] [prev in thread] [next in thread]