s3:libsmb: handle the spnego as a first action in cli_session_setup_send()

This will make further restructuring easier.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 614f0e9fc0a65dee8971e1e4baf7a3aa3cd2f197..56d0d4096f5aecde53a7b11cf8a021152b67fe87 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -2018,6 +2018,7 @@ struct tevent_req *cli_session_setup_send(TALLOC_CTX *mem_ctx,
        char *p;
        char *user2;
        uint16_t sec_mode = smb1cli_conn_server_security_mode(cli->conn);
+       bool use_spnego = false;
        int passlen = 0;
 
        if (pass != NULL) {
@@ -2068,6 +2069,31 @@ struct tevent_req *cli_session_setup_send(TALLOC_CTX *mem_ctx,
         * do. I have split this into separate functions to make the flow a bit
         * easier to understand (tridge).
         */
+       if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_NT1) {
+               use_spnego = false;
+       } else if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+               use_spnego = true;
+       } else if (smb1cli_conn_capabilities(cli->conn) & CAP_EXTENDED_SECURITY) {
+               /*
+                * if the server supports extended security then use SPNEGO
+                * even for anonymous connections.
+                */
+               use_spnego = true;
+       } else {
+               use_spnego = false;
+       }
+
+       if (use_spnego) {
+               subreq = cli_session_setup_spnego_send(
+                       state, ev, cli, user, pass, workgroup);
+               if (tevent_req_nomem(subreq, req)) {
+                       return tevent_req_post(req, ev);
+               }
+               tevent_req_set_callback(subreq, cli_session_setup_done_spnego,
+                                       req);
+               return req;
+       }
+
        if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_LANMAN1) {
                /*
                 * SessionSetupAndX was introduced by LANMAN 1.0. So we skip
@@ -2105,32 +2131,6 @@ struct tevent_req *cli_session_setup_send(TALLOC_CTX *mem_ctx,
                return req;
        }
 
-       if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
-               subreq = cli_session_setup_spnego_send(
-                       state, ev, cli, user, pass, workgroup);
-               if (tevent_req_nomem(subreq, req)) {
-                       return tevent_req_post(req, ev);
-               }
-               tevent_req_set_callback(subreq, cli_session_setup_done_spnego,
-                                       req);
-               return req;
-       }
-
-       /*
-        * if the server supports extended security then use SPNEGO
-        * even for anonymous connections.
-        */
-       if (smb1cli_conn_capabilities(cli->conn) & CAP_EXTENDED_SECURITY) {
-               subreq = cli_session_setup_spnego_send(
-                       state, ev, cli, user, pass, workgroup);
-               if (tevent_req_nomem(subreq, req)) {
-                       return tevent_req_post(req, ev);
-               }
-               tevent_req_set_callback(subreq, cli_session_setup_done_spnego,
-                                       req);
-               return req;
-       }
-
        /* if no user is supplied then we have to do an anonymous connection.
           passwords are ignored */