]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
auth-policy: Move callback to helper function
authorAki Tuomi <aki.tuomi@open-xchange.com>
Thu, 14 Feb 2019 09:58:33 +0000 (11:58 +0200)
committerAki Tuomi <aki.tuomi@open-xchange.com>
Thu, 21 Feb 2019 07:43:55 +0000 (07:43 +0000)
src/auth/auth-policy.c

index d5cf75049f047f1cf6a78c8da438f113bb2fedc8..be50c1f1cfe9a4e6b06117efdfeeadfd8ece4e7d 100755 (executable)
@@ -247,6 +247,13 @@ void auth_policy_finish(struct policy_lookup_ctx *context)
                auth_request_unref(&context->request);
 }
 
+static
+void auth_policy_callback(struct policy_lookup_ctx *context)
+{
+       if (context->callback != NULL)
+               context->callback(context->result, context->callback_context);
+}
+
 static
 void auth_policy_parse_response(struct policy_lookup_ctx *context)
 {
@@ -332,9 +339,7 @@ void auth_policy_parse_response(struct policy_lookup_ctx *context)
                        (context->message!=NULL?context->message:""));
        }
 
-       if (context->callback != NULL) {
-               context->callback(context->result, context->callback_context);
-       }
+       auth_policy_callback(context);
 }
 
 static
@@ -349,8 +354,7 @@ void auth_policy_process_response(const struct http_response *response,
                auth_request_log_error(context->request, "policy",
                        "Policy server HTTP error: %s",
                        http_response_get_message(response));
-               if (context->callback != NULL)
-                       context->callback(context->result, context->callback_context);
+               auth_policy_callback(context);
                return;
        }
 
@@ -358,8 +362,7 @@ void auth_policy_process_response(const struct http_response *response,
                if (context->expect_result)
                        auth_request_log_error(context->request, "policy",
                                "Policy server result was empty");
-               if (context->callback != NULL)
-                       context->callback(context->result, context->callback_context);
+               auth_policy_callback(context);
                return;
        }
 
@@ -371,8 +374,7 @@ void auth_policy_process_response(const struct http_response *response,
        } else {
                auth_request_log_debug(context->request, "policy",
                        "Policy response %d", context->result);
-               if (context->callback != NULL)
-                       context->callback(context->result, context->callback_context);
+               auth_policy_callback(context);
        }
 }