From: Nick Porter <nick@portercomputing.co.uk>
Date: Wed, 13 Dec 2023 08:04:42 +0000 (+0000)
Subject: Align function prototypes with the functions
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98fb3db7a2b7997b9d063d903312b33f14c79776;p=thirdparty%2Ffreeradius-server.git

Align function prototypes with the functions
---

diff --git a/src/lib/ldap/base.h b/src/lib/ldap/base.h
index 941c1cf9030..aa4401b5d7b 100644
--- a/src/lib/ldap/base.h
+++ b/src/lib/ldap/base.h
@@ -903,7 +903,7 @@ int		fr_ldap_sasl_bind_auth_send(fr_ldap_sasl_ctx_t *sasl_ctx,
 					    int *msgid,
 					    fr_ldap_connection_t *ldap_conn);
 
-int		fr_ldap_sasl_bind_auth_async(request_t *request,
+unlang_action_t	fr_ldap_sasl_bind_auth_async(request_t *request,
 					     fr_ldap_thread_t *thread,
 					     char const *mechs,
 					     char const *identity,
@@ -914,7 +914,7 @@ int		fr_ldap_sasl_bind_auth_async(request_t *request,
 /*
  *	bind.c - Async bind
  */
-unlang_action_t	fr_ldap_bind_async(fr_ldap_connection_t *c,
+int		fr_ldap_bind_async(fr_ldap_connection_t *c,
 				   char const *bind_dn, char const *password,
 				   LDAPControl **serverctrls, LDAPControl **clientctrls);
 
diff --git a/src/lib/unlang/unlang_priv.h b/src/lib/unlang/unlang_priv.h
index f7b86c9c282..e275891ea39 100644
--- a/src/lib/unlang/unlang_priv.h
+++ b/src/lib/unlang/unlang_priv.h
@@ -565,7 +565,7 @@ int		unlang_interpret_push(request_t *request, unlang_t const *instruction,
 				      rlm_rcode_t default_rcode, bool do_next_sibling, bool top_frame)
 				      CC_HINT(warn_unused_result);
 
-int		unlang_interpret_push_children(rlm_rcode_t *p_result, request_t *request,
+unlang_action_t	unlang_interpret_push_children(rlm_rcode_t *p_result, request_t *request,
 					       rlm_rcode_t default_rcode, bool do_next_sibling)
 					       CC_HINT(warn_unused_result);
 
diff --git a/src/modules/rlm_ldap/rlm_ldap.h b/src/modules/rlm_ldap/rlm_ldap.h
index c5c85bfeb69..da3f285bd40 100644
--- a/src/modules/rlm_ldap/rlm_ldap.h
+++ b/src/modules/rlm_ldap/rlm_ldap.h
@@ -243,9 +243,10 @@ static inline char const *rlm_find_user_dn_cached(request_t *request)
 	return vp->vp_strvalue;
 }
 
-int rlm_ldap_find_user_async(TALLOC_CTX *ctx, rlm_ldap_t const *inst, request_t *request, fr_value_box_t *base,
-			     fr_value_box_t *filter_box, fr_ldap_thread_trunk_t *ttrunk, char const *attrs[],
-			     fr_ldap_query_t **query_out);
+unlang_action_t rlm_ldap_find_user_async(TALLOC_CTX *ctx, rlm_ldap_t const *inst, request_t *request,
+					 fr_value_box_t *base, fr_value_box_t *filter_box,
+					 fr_ldap_thread_trunk_t *ttrunk, char const *attrs[],
+					 fr_ldap_query_t **query_out);
 
 ldap_access_state_t rlm_ldap_check_access(rlm_ldap_t const *inst, request_t *request, LDAPMessage *entry);