s3:libsmb: get rid of cli_state_security_mode

Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 03a61e3b257578c49a7a92e21084f46c3821f823..a9ac383964ec88434dcb1c63b462075062c17971 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -108,7 +108,7 @@ static struct tevent_req *cli_session_setup_lanman2_send(
        uint16_t *vwv;
        uint8_t *bytes;
        char *tmp;
-       uint16_t sec_mode = cli_state_security_mode(cli);
+       uint16_t sec_mode = smb1cli_conn_server_security_mode(cli->conn);
 
        req = tevent_req_create(mem_ctx, &state,
                                struct cli_session_setup_lanman2_state);
@@ -2017,7 +2017,7 @@ NTSTATUS cli_session_setup(struct cli_state *cli,
 {
        char *p;
        char *user2;
-       uint16_t sec_mode = cli_state_security_mode(cli);
+       uint16_t sec_mode = smb1cli_conn_server_security_mode(cli->conn);
 
        if (user) {
                user2 = talloc_strdup(talloc_tos(), user);
@@ -2243,7 +2243,7 @@ struct tevent_req *cli_tcon_andx_create(TALLOC_CTX *mem_ctx,
        uint16_t *vwv;
        char *tmp = NULL;
        uint8_t *bytes;
-       uint16_t sec_mode = cli_state_security_mode(cli);
+       uint16_t sec_mode = smb1cli_conn_server_security_mode(cli->conn);
 
        *psmbreq = NULL;
 

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 615324faa6bfa4b15e137da2fa657d1ba896d828..a7135359d374e25bb3c21cc07685edbba958629b 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -437,11 +437,6 @@ uint32_t cli_state_available_size(struct cli_state *cli, uint32_t ofs)
        return ret;
 }
 
-uint16_t cli_state_security_mode(struct cli_state *cli)
-{
-       return smb1cli_conn_server_security_mode(cli->conn);
-}
-
 int cli_state_server_time_zone(struct cli_state *cli)
 {
        return smb1cli_conn_server_time_zone(cli->conn);

diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 987e372c0345dfc65f883e59ec474ee28c7f6456..70e5027504212a4cbc7a38bacd0d0a986fd2bdd5 100644 (file)
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -181,7 +181,6 @@ uint16_t cli_state_get_uid(struct cli_state *cli);
 uint16_t cli_state_set_uid(struct cli_state *cli, uint16_t uid);
 bool cli_set_case_sensitive(struct cli_state *cli, bool case_sensitive);
 uint32_t cli_state_available_size(struct cli_state *cli, uint32_t ofs);
-uint16_t cli_state_security_mode(struct cli_state *cli);
 int cli_state_server_time_zone(struct cli_state *cli);
 time_t cli_state_server_time(struct cli_state *cli);
 struct tevent_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct event_context *ev,

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index d190bb39a168c0aa39c48f4a9c03fed7668fd562..81d19a9d72509859257333dbf3fe684b72d1ae4d 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -918,7 +918,7 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
 
        cm_get_ipc_userpass(&ipc_username, &ipc_domain, &ipc_password);
 
-       sec_mode = cli_state_security_mode(*cli);
+       sec_mode = smb1cli_conn_server_security_mode((*cli)->conn);
 
        try_ipc_auth = false;
        if (try_spnego) {