summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorLuk Claes <luk@debian.org>2012-05-20 17:54:29 +0200
committerStefan Metzmacher <metze@samba.org>2012-05-28 14:49:49 +0200
commit764b5e56108362a53acf8f435203dd1e56ecd2ce (patch)
tree2433fbabf58b5351da003c163e1c9a85d054f4d9 /source3/libsmb
parent82895ab22fb19fabe43ec29365dbe33da0b917f2 (diff)
downloadsamba-764b5e56108362a53acf8f435203dd1e56ecd2ce.tar.gz
samba-764b5e56108362a53acf8f435203dd1e56ecd2ce.tar.bz2
samba-764b5e56108362a53acf8f435203dd1e56ecd2ce.zip
s3:libsmb: get rid of cli_negprot
Signed-off-by: Luk Claes <luk@debian.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/cliconnect.c24
-rw-r--r--source3/libsmb/clidfs.c3
-rw-r--r--source3/libsmb/libsmb_server.c3
-rw-r--r--source3/libsmb/passchange.c4
-rw-r--r--source3/libsmb/proto.h6
5 files changed, 9 insertions, 31 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index a9ac383964..491b7039f9 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -2606,27 +2606,6 @@ fail:
return status;
}
-struct tevent_req *cli_negprot_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
- struct cli_state *cli,
- enum protocol_types max_protocol)
-{
- return smbXcli_negprot_send(mem_ctx, ev,
- cli->conn, cli->timeout,
- PROTOCOL_CORE, max_protocol);
-}
-
-NTSTATUS cli_negprot_recv(struct tevent_req *req)
-{
- return smbXcli_negprot_recv(req);
-}
-
-NTSTATUS cli_negprot(struct cli_state *cli, enum protocol_types max_protocol)
-{
- return smbXcli_negprot(cli->conn, cli->timeout,
- PROTOCOL_CORE, max_protocol);
-}
-
static NTSTATUS cli_connect_sock(const char *host, int name_type,
const struct sockaddr_storage *pss,
const char *myname, uint16_t port,
@@ -2768,7 +2747,8 @@ NTSTATUS cli_start_connection(struct cli_state **output_cli,
return nt_status;
}
- nt_status = cli_negprot(cli, PROTOCOL_NT1);
+ nt_status = smbXcli_negprot(cli->conn, cli->timeout, PROTOCOL_CORE,
+ PROTOCOL_NT1);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(1, ("failed negprot: %s\n", nt_errstr(nt_status)));
cli_shutdown(cli);
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index ff89dcc505..8aae42bb86 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -147,7 +147,8 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
}
DEBUG(4,(" session request ok\n"));
- status = cli_negprot(c, max_protocol);
+ status = smbXcli_negprot(c->conn, c->timeout, PROTOCOL_CORE,
+ max_protocol);
if (!NT_STATUS_IS_OK(status)) {
d_printf("protocol negotiation failed: %s\n",
diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index ccbb6f1aa5..c7ec142ffc 100644
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -442,7 +442,8 @@ SMBC_server_internal(TALLOC_CTX *ctx,
cli_set_timeout(c, smbc_getTimeout(context));
- status = cli_negprot(c, PROTOCOL_NT1);
+ status = smbXcli_negprot(c->conn, c->timeout, PROTOCOL_CORE,
+ PROTOCOL_NT1);
if (!NT_STATUS_IS_OK(status)) {
cli_shutdown(c);
diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
index ea6d9d5edb..393383336b 100644
--- a/source3/libsmb/passchange.c
+++ b/source3/libsmb/passchange.c
@@ -24,6 +24,7 @@
#include "libsmb/libsmb.h"
#include "libsmb/clirap.h"
#include "libsmb/nmblib.h"
+#include "../libcli/smb/smbXcli_base.h"
/*************************************************************
Change a password on a remote machine using IPC calls.
@@ -66,7 +67,8 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam
return result;
}
- result = cli_negprot(cli, PROTOCOL_NT1);
+ result = smbXcli_negprot(cli->conn, cli->timeout, PROTOCOL_CORE,
+ PROTOCOL_NT1);
if (!NT_STATUS_IS_OK(result)) {
if (asprintf(err_str, "machine %s rejected the negotiate "
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index a584a63763..3f25958825 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -72,12 +72,6 @@ struct tevent_req *cli_tdis_send(TALLOC_CTX *mem_ctx,
struct cli_state *cli);
NTSTATUS cli_tdis_recv(struct tevent_req *req);
NTSTATUS cli_tdis(struct cli_state *cli);
-NTSTATUS cli_negprot(struct cli_state *cli, enum protocol_types max_protocol);
-struct tevent_req *cli_negprot_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
- struct cli_state *cli,
- enum protocol_types max_protocol);
-NTSTATUS cli_negprot_recv(struct tevent_req *req);
NTSTATUS cli_connect_nb(const char *host, const struct sockaddr_storage *dest_ss,
uint16_t port, int name_type, const char *myname,
int signing_state, int flags, struct cli_state **pcli);