]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
libsmb: Remove cli_full_connection_creds_sess_start()
authorVolker Lendecke <vl@samba.org>
Thu, 25 Aug 2022 08:31:42 +0000 (10:31 +0200)
committerJeremy Allison <jra@samba.org>
Fri, 26 Aug 2022 18:54:37 +0000 (18:54 +0000)
This contained very simple tevent_req logic, hiding that confused the
code for me when reading. Also, this change saves 3 lines...

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/libsmb/cliconnect.c

index d894ef76a36bb3907d9b91001088150723e046cf..a49df948cadb95549c489aae653e81b7a8aa311a 100644 (file)
@@ -3372,7 +3372,6 @@ static int cli_full_connection_creds_state_destructor(
 }
 
 static void cli_full_connection_creds_conn_done(struct tevent_req *subreq);
-static void cli_full_connection_creds_sess_start(struct tevent_req *req);
 static void cli_full_connection_creds_sess_done(struct tevent_req *subreq);
 static void cli_full_connection_creds_enc_start(struct tevent_req *req);
 static void cli_full_connection_creds_enc_tcon(struct tevent_req *subreq);
@@ -3452,15 +3451,6 @@ static void cli_full_connection_creds_conn_done(struct tevent_req *subreq)
                return;
        }
 
-       cli_full_connection_creds_sess_start(req);
-}
-
-static void cli_full_connection_creds_sess_start(struct tevent_req *req)
-{
-       struct cli_full_connection_creds_state *state = tevent_req_data(
-               req, struct cli_full_connection_creds_state);
-       struct tevent_req *subreq = NULL;
-
        subreq = cli_session_setup_creds_send(
                state, state->ev, state->cli, state->creds);
        if (tevent_req_nomem(subreq, req)) {
@@ -3492,7 +3482,14 @@ static void cli_full_connection_creds_sess_done(struct tevent_req *subreq)
                        return;
                }
 
-               cli_full_connection_creds_sess_start(req);
+               subreq = cli_session_setup_creds_send(
+                       state, state->ev, state->cli, state->creds);
+               if (tevent_req_nomem(subreq, req)) {
+                       return;
+               }
+               tevent_req_set_callback(subreq,
+                                       cli_full_connection_creds_sess_done,
+                                       req);
                return;
        }