From 39a0dc5dd670cb251e3c9a3b35aca9dbb2ede061 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Tue, 14 Apr 2015 13:07:36 -0400
Subject: [PATCH 1/3] AD: Clean up ad_access_gpo

Align goto usage with conventions in the rest of the source.
---
 src/providers/ad/ad_gpo.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/providers/ad/ad_gpo.c b/src/providers/ad/ad_gpo.c
index a881741a6ead9244ac123608234d1a0c35f830e3..54e5545a57b7e697f730431ae35a95ccabbe21db 100644
--- a/src/providers/ad/ad_gpo.c
+++ b/src/providers/ad/ad_gpo.c
@@ -1532,12 +1532,10 @@ ad_gpo_access_send(TALLOC_CTX *mem_ctx,
     DEBUG(SSSDBG_TRACE_FUNC, "service %s maps to %s\n", service,
           gpo_map_type_string(gpo_map_type));
 
     if (gpo_map_type == GPO_MAP_PERMIT) {
         ret = EOK;
-        tevent_req_done(req);
-        tevent_req_post(req, ev);
         goto immediately;
     }
 
     if (gpo_map_type == GPO_MAP_DENY) {
         switch (ctx->gpo_access_control_mode) {
@@ -1549,12 +1547,10 @@ ad_gpo_access_send(TALLOC_CTX *mem_ctx,
             sss_log_ext(SSS_LOG_WARNING, LOG_AUTHPRIV, "Warning: user would " \
                         "have been denied GPO-based logon access if the " \
                         "ad_gpo_access_control option were set to enforcing " \
                         "mode.");
             ret = EOK;
-            tevent_req_done(req);
-            tevent_req_post(req, ev);
             goto immediately;
         default:
             ret = EINVAL;
             goto immediately;
         }
@@ -1590,19 +1586,21 @@ ad_gpo_access_send(TALLOC_CTX *mem_ctx,
                ret, sss_strerror(ret));
         goto immediately;
     }
     tevent_req_set_callback(subreq, ad_gpo_connect_done, req);
 
-    ret = EOK;
+    return req;
 
 immediately:
 
-    if (ret != EOK) {
+    if (ret == EOK) {
+        tevent_req_done(req);
+    } else {
         tevent_req_error(req, ret);
-        tevent_req_post(req, ev);
     }
 
+    tevent_req_post(req, ev);
     return req;
 }
 
 static errno_t
 process_offline_gpos(TALLOC_CTX *mem_ctx,
-- 
2.3.5