s3:libsmb: Remove signing_state from cli_full_connection_creds_send()

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

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index bb20aa593857f154886c7c69770c4852e0373076..0ff9c283e399d8b88f4d8b7fb8c735344f2fd332 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -3361,10 +3361,11 @@ struct tevent_req *cli_full_connection_creds_send(
        const struct sockaddr_storage *dest_ss, int port,
        const char *service, const char *service_type,
        struct cli_credentials *creds,
-       int flags, enum smb_signing_setting signing_state)
+       int flags)
 {
        struct tevent_req *req, *subreq;
        struct cli_full_connection_creds_state *state;
+       enum smb_signing_setting signing_state;
 
        req = tevent_req_create(mem_ctx, &state,
                                struct cli_full_connection_creds_state);
@@ -3379,6 +3380,12 @@ struct tevent_req *cli_full_connection_creds_send(
        state->creds = creds;
        state->flags = flags;
 
+       if (flags & CLI_FULL_CONNECTION_IPC) {
+               signing_state = cli_credentials_get_smb_ipc_signing(creds);
+       } else {
+               signing_state = cli_credentials_get_smb_signing(creds);
+       }
+
        subreq = cli_start_connection_send(
                state, ev, my_name, dest_host, dest_ss, port,
                signing_state, flags);
@@ -3532,7 +3539,7 @@ NTSTATUS cli_full_connection_creds(struct cli_state **output_cli,
        }
        req = cli_full_connection_creds_send(
                ev, ev, my_name, dest_host, dest_ss, port, service,
-               service_type, creds, flags, signing_state);
+               service_type, creds, flags);
        if (req == NULL) {
                goto fail;
        }

diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 995187e21b49dd18d545522557ef6b1bb157373a..bef04d32638fcd42b24d370c9da9e17f211aedd2 100644 (file)
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -100,7 +100,7 @@ struct tevent_req *cli_full_connection_creds_send(
        const struct sockaddr_storage *dest_ss, int port,
        const char *service, const char *service_type,
        struct cli_credentials *creds,
-       int flags, enum smb_signing_setting signing_state);
+       int flags);
 NTSTATUS cli_full_connection_creds_recv(struct tevent_req *req,
                                        struct cli_state **output_cli);
 NTSTATUS cli_full_connection_creds(struct cli_state **output_cli,

diff --git a/source3/libsmb/pylibsmb.c b/source3/libsmb/pylibsmb.c
index f8a4d56cf53a545226181cf21dd23d6b3df5f531..c7a2d73afcb56f05666b3d676ee556171fe2b617 100644 (file)
--- a/source3/libsmb/pylibsmb.c
+++ b/source3/libsmb/pylibsmb.c
@@ -440,7 +440,6 @@ static int py_cli_state_init(struct py_cli_state *self, PyObject *args,
        PyObject *py_lp = Py_None;
        PyObject *py_multi_threaded = Py_False;
        bool multi_threaded = false;
-       enum smb_signing_setting signing_state = SMB_SIGNING_DEFAULT;
        PyObject *py_force_smb1 = Py_False;
        bool force_smb1 = false;
        PyObject *py_ipc = Py_False;
@@ -524,15 +523,9 @@ static int py_cli_state_init(struct py_cli_state *self, PyObject *args,
                cli_creds = PyCredentials_AsCliCredentials(creds);
        }
 
-       if (use_ipc) {
-               signing_state = cli_credentials_get_smb_ipc_signing(cli_creds);
-       } else {
-               signing_state = cli_credentials_get_smb_signing(cli_creds);
-       }
-
        req = cli_full_connection_creds_send(
                NULL, self->ev, "myname", host, NULL, 0, share, "?????",
-               cli_creds, flags, signing_state);
+               cli_creds, flags);
        if (!py_tevent_req_wait_exc(self, req)) {
                return -1;
        }