summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-05-28 20:39:54 +0200
committerVolker Lendecke <vl@samba.org>2011-05-28 20:50:09 +0200
commit57ae32794f841365a73f22df3b872eb001c21abc (patch)
tree6bb6f85381b746b8c7d81be7dcf9911cb1c5e123
parentc430b57ce44e67d3eddc0d2fffaa78b9b0f36af5 (diff)
downloadsamba-57ae32794f841365a73f22df3b872eb001c21abc.tar.gz
samba-57ae32794f841365a73f22df3b872eb001c21abc.tar.bz2
samba-57ae32794f841365a73f22df3b872eb001c21abc.zip
s3: Add called name_type param to cli_connect_nb
-rw-r--r--source3/libsmb/cliconnect.c5
-rw-r--r--source3/libsmb/proto.h2
-rw-r--r--source3/torture/locktest.c3
-rw-r--r--source3/torture/masktest.c3
4 files changed, 7 insertions, 6 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 60637451d0..3921fbcb1c 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -3151,13 +3151,12 @@ fail:
}
NTSTATUS cli_connect_nb(const char *host, struct sockaddr_storage *pss,
- uint16_t port, const char *myname,
+ uint16_t port, int name_type, const char *myname,
int signing_state, struct cli_state **pcli)
{
TALLOC_CTX *frame = talloc_stackframe();
struct cli_state *cli;
NTSTATUS status = NT_STATUS_NO_MEMORY;
- int name_type = 0x20;
int fd = -1;
char *desthost;
char *p;
@@ -3229,7 +3228,7 @@ NTSTATUS cli_start_connection(struct cli_state **output_cli,
NTSTATUS nt_status;
struct cli_state *cli;
- nt_status = cli_connect_nb(dest_host, dest_ss, port, my_name,
+ nt_status = cli_connect_nb(dest_host, dest_ss, port, 0x20, my_name,
signing_state, &cli);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(10, ("cli_connect_nb failed: %s\n",
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 3a34486c04..7a8f5677f6 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -74,7 +74,7 @@ NTSTATUS cli_connect(struct cli_state *cli,
const char *host,
struct sockaddr_storage *dest_ss);
NTSTATUS cli_connect_nb(const char *host, struct sockaddr_storage *pss,
- uint16_t port, const char *myname,
+ uint16_t port, int name_type, const char *myname,
int signing_state, struct cli_state **pcli);
NTSTATUS cli_start_connection(struct cli_state **output_cli,
const char *my_name,
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index 38f05f1894..d27eb5fa54 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -182,7 +182,8 @@ static struct cli_state *connect_one(char *share, int snum)
/* have to open a new connection */
- status = cli_connect_nb(server_n, NULL, 0, myname, Undefined, &c);
+ status = cli_connect_nb(server_n, NULL, 0, 0x20, myname, Undefined,
+ &c);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("Connection to %s failed. Error %s\n", server_n,
nt_errstr(status)));
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index a1734abded..6eca1da693 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -179,7 +179,8 @@ static struct cli_state *connect_one(char *share)
server_n = server;
- status = cli_connect_nb(server, NULL, 0, "masktest", Undefined, &c);
+ status = cli_connect_nb(server, NULL, 0, 0x20, "masktest", Undefined,
+ &c);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("Connection to %s failed. Error %s\n", server_n,
nt_errstr(status)));