From 62ac67997fc2936279394dfa2f5e4883b355ceaa Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 16 Oct 2009 14:54:14 -0400 Subject: Always list inputs before outputs --- server/providers/ldap/ldap_auth.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/server/providers/ldap/ldap_auth.c b/server/providers/ldap/ldap_auth.c index 31f9c43e3..275c89452 100644 --- a/server/providers/ldap/ldap_auth.c +++ b/server/providers/ldap/ldap_auth.c @@ -524,12 +524,13 @@ static void auth_bind_user_done(struct tevent_req *subreq) tevent_req_done(req); } -int auth_recv(struct tevent_req *req, enum sdap_result *result, - TALLOC_CTX *memctx, struct sdap_handle **sh, char **dn, - enum pwexpire *pw_expire_type, void **pw_expire_data) +int auth_recv(struct tevent_req *req, + TALLOC_CTX *memctx, + struct sdap_handle **sh, + enum sdap_result *result, char **dn, + enum pwexpire *pw_expire_type, void **pw_expire_data) { - struct auth_state *state = tevent_req_data(req, - struct auth_state); + struct auth_state *state = tevent_req_data(req, struct auth_state); enum tevent_req_state tstate; uint64_t err; @@ -646,7 +647,8 @@ static void sdap_auth4chpass_done(struct tevent_req *req) int dp_err = DP_ERR_FATAL; int ret; - ret = auth_recv(req, &result, state, &state->sh, &state->dn, + ret = auth_recv(req, state, &state->sh, + &result, &state->dn, &pw_expire_type, &pw_expire_data); talloc_zfree(req); if (ret) { @@ -829,8 +831,9 @@ static void sdap_pam_auth_done(struct tevent_req *req) int dp_err = DP_ERR_OK; int ret; - ret = auth_recv(req, &result, state, NULL, NULL, &pw_expire_type, - &pw_expire_data); + ret = auth_recv(req, state, NULL, + &result, NULL, + &pw_expire_type, &pw_expire_data); talloc_zfree(req); if (ret) { state->pd->pam_status = PAM_SYSTEM_ERR; -- cgit