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

[ira/wip.git] / source3 / libsmb / clientgen.c

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index a41aa11f7ad3a946f8958747cb8e0380c4192125..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.
 ****************************************************************************/
@@ -650,7 +656,7 @@ static void cli_echo_recv_helper(struct async_req *req)
 
        status = cli_pull_reply(req, &wct, &vwv, &num_bytes, &bytes);
        if (!NT_STATUS_IS_OK(status)) {
-               async_req_error(req, status);
+               async_req_nterror(req, status);
                return;
        }
 
@@ -659,7 +665,7 @@ static void cli_echo_recv_helper(struct async_req *req)
        if ((num_bytes != cli_req->data.echo.data.length)
            || (memcmp(cli_req->data.echo.data.data, bytes,
                       num_bytes) != 0)) {
-               async_req_error(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               async_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
                return;
        }
 
@@ -727,7 +733,7 @@ struct async_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
 
 NTSTATUS cli_echo_recv(struct async_req *req)
 {
-       return async_req_simple_recv(req);
+       return async_req_simple_recv_ntstatus(req);
 }
 
 /**