[PATCH 2/6] replace libsmb1cli_conn_server_security_mode

Luk Claes luk at debian.org
Sat May 18 02:50:54 MDT 2013


Signed-off-by: Luk Claes <luk at debian.org>
---
 source3/libsmb/cliconnect.c       |    6 +++---
 source3/winbindd/winbindd_cm.c    |    2 +-
 source4/libcli/raw/rawnegotiate.c |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 7179c4f..d6773b0 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -96,7 +96,7 @@ static struct tevent_req *cli_session_setup_lanman2_send(
 	uint16_t *vwv;
 	uint8_t *bytes;
 	char *tmp;
-	uint16_t sec_mode = smb1cli_conn_server_security_mode(cli->conn);
+	uint16_t sec_mode = smbXcli_conn_server_security_mode(cli->conn);
 
 	req = tevent_req_create(mem_ctx, &state,
 				struct cli_session_setup_lanman2_state);
@@ -1957,7 +1957,7 @@ struct tevent_req *cli_session_setup_send(TALLOC_CTX *mem_ctx,
 	struct cli_session_setup_state *state;
 	char *p;
 	char *user2;
-	uint16_t sec_mode = smb1cli_conn_server_security_mode(cli->conn);
+	uint16_t sec_mode = smbXcli_conn_server_security_mode(cli->conn);
 
 	req = tevent_req_create(mem_ctx, &state,
 				struct cli_session_setup_state);
@@ -2344,7 +2344,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 = smb1cli_conn_server_security_mode(cli->conn);
+	uint16_t sec_mode = smbXcli_conn_server_security_mode(cli->conn);
 	uint16_t tcon_flags = 0;
 
 	*psmbreq = NULL;
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 50728a5..3c5843b 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -933,7 +933,7 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
 
 	cm_get_ipc_userpass(&ipc_username, &ipc_domain, &ipc_password);
 
-	sec_mode = smb1cli_conn_server_security_mode((*cli)->conn);
+	sec_mode = smbXcli_conn_server_security_mode((*cli)->conn);
 
 	try_ipc_auth = false;
 	if (try_spnego) {
diff --git a/source4/libcli/raw/rawnegotiate.c b/source4/libcli/raw/rawnegotiate.c
index 9b0ed38..a983749 100644
--- a/source4/libcli/raw/rawnegotiate.c
+++ b/source4/libcli/raw/rawnegotiate.c
@@ -85,7 +85,7 @@ static void smb_raw_negotiate_done(struct tevent_req *subreq)
 
 	n->protocol = smbXcli_conn_protocol(c);
 
-	n->sec_mode = smb1cli_conn_server_security_mode(c);
+	n->sec_mode = smbXcli_conn_server_security_mode(c);
 	n->max_mux  = smbXcli_conn_max_requests(c);
 	n->max_xmit = smb1cli_conn_max_xmit(c);
 	n->sesskey  = smb1cli_conn_server_session_key(c);
-- 
1.7.10.4



More information about the samba-technical mailing list