diff options
| author | Luk Claes <luk@debian.org> | 2012-05-19 18:47:31 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-05-28 14:49:48 +0200 |
| commit | 278ba9928ab0f36c933f3190aee136bbc964055a (patch) | |
| tree | 93d8cdf1fcd7719812acb2a6e71ec392dc6dcac8 | |
| parent | 5f10bd9fe4d8738564ea9674645b6521c131dccf (diff) | |
| download | samba-278ba9928ab0f36c933f3190aee136bbc964055a.tar.gz samba-278ba9928ab0f36c933f3190aee136bbc964055a.tar.bz2 samba-278ba9928ab0f36c933f3190aee136bbc964055a.zip | |
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>
| -rw-r--r-- | source3/libsmb/cliconnect.c | 6 | ||||
| -rw-r--r-- | source3/libsmb/clientgen.c | 5 | ||||
| -rw-r--r-- | source3/libsmb/proto.h | 1 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 03a61e3b25..a9ac383964 100644 --- 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 615324faa6..a7135359d3 100644 --- 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 987e372c03..70e5027504 100644 --- 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 d190bb39a1..81d19a9d72 100644 --- 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) { |