s3:libsmb: remove cli_setup_signing_state() and add struct cli_state *cli_initialise_ex()

This prepares the next changes.

metze

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6376d8af8a4f3e659c0c1b8425d2eed93ad67bb8..c8dff53fddfffa7342fc2eaefbf08bed67a6d4e8 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2430,8 +2430,8 @@ void cli_setup_packet_buf(struct cli_state *cli, char *buf);
 void cli_setup_packet(struct cli_state *cli);
 void cli_setup_bcc(struct cli_state *cli, void *p);
 void cli_init_creds(struct cli_state *cli, const char *username, const char *domain, const char *password);
-void cli_setup_signing_state(struct cli_state *cli, int signing_state);
 struct cli_state *cli_initialise(void);
+struct cli_state *cli_initialise_ex(int signing_state);
 void cli_nt_pipes_close(struct cli_state *cli);
 void cli_shutdown(struct cli_state *cli);
 void cli_sockopt(struct cli_state *cli, const char *options);

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 58e7dd1f8ecd55fc004b3943aea9460c711eba51..e3d1b65be0d209f201e88edb968db45274bc06cc 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1949,7 +1949,7 @@ NTSTATUS cli_start_connection(struct cli_state **output_cli,
        if (!my_name) 
                my_name = global_myname();
 
-       if (!(cli = cli_initialise())) {
+       if (!(cli = cli_initialise_ex(signing_state))) {
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -1997,8 +1997,6 @@ again:
                return NT_STATUS_BAD_NETWORK_NAME;
        }
 
-       cli_setup_signing_state(cli, signing_state);
-
        if (flags & CLI_FULL_CONNECTION_DONT_SPNEGO)
                cli->use_spnego = False;
        else if (flags & CLI_FULL_CONNECTION_USE_KERBEROS)

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index e642f169f974eebf442d2adf3b2efd8504c9594a..1153d8dc8994b9fe6bbd2e0bffd619fb669b48f4 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -151,7 +151,7 @@ static struct cli_state *do_connect(TALLOC_CTX *ctx,
        zero_sockaddr(&ss);
 
        /* have to open a new connection */
-       if (!(c=cli_initialise())) {
+       if (!(c=cli_initialise_ex(cm_creds.signing_state))) {
                d_printf("Connection to %s failed\n", server_n);
                if (c) {
                        cli_shutdown(c);
@@ -177,7 +177,6 @@ static struct cli_state *do_connect(TALLOC_CTX *ctx,
        c->protocol = max_protocol;
        c->use_kerberos = cm_creds.use_kerberos;
        c->fallback_after_kerberos = cm_creds.fallback_after_kerberos;
-       cli_setup_signing_state(c, cm_creds.signing_state);
 
        if (!cli_session_request(c, &calling, &called)) {
                char *p;

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 0382ef5fae7223dd19d11d740ede61356357e3ab..41b1fe885956255e12b2a01cf3ac0a06bf1696c1 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -428,7 +428,7 @@ void cli_init_creds(struct cli_state *cli, const char *username, const char *dom
  Set the signing state (used from the command line).
 ****************************************************************************/
 
-void cli_setup_signing_state(struct cli_state *cli, int signing_state)
+static void cli_setup_signing_state(struct cli_state *cli, int signing_state)
 {
        if (signing_state == Undefined)
                return;
@@ -449,7 +449,7 @@ void cli_setup_signing_state(struct cli_state *cli, int signing_state)
  Initialise a client structure. Always returns a malloc'ed struct.
 ****************************************************************************/
 
-struct cli_state *cli_initialise(void)
+struct cli_state *cli_initialise_ex(int signing_state)
 {
        struct cli_state *cli = NULL;
 
@@ -511,6 +511,7 @@ struct cli_state *cli_initialise(void)
 
        /* initialise signing */
        cli_null_set_signing(cli);
+       cli_setup_signing_state(cli, signing_state);
 
        cli->initialised = 1;
 
@@ -526,6 +527,11 @@ struct cli_state *cli_initialise(void)
         return NULL;
 }
 
+struct cli_state *cli_initialise(void)
+{
+       return cli_initialise_ex(Undefined);
+}
+
 /****************************************************************************
  Close all pipes open on this session.
 ****************************************************************************/