s3: Add called name_type param to cli_connect_nb

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 60637451d0de6f46f08099d9c9adce6c67771e77..3921fbcb1c80ce7a90a829fc6f610f6a6113b84b 100644 (file)
--- 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 3a34486c04ce70567caf5038078949e791af92dd..7a8f5677f686a9133ba524f7dc4a1bf39cfdfc23 100644 (file)
--- 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 38f05f1894c92b7567de721a9793f33119faa8ba..d27eb5fa5481357e016622d572b58f4f26f5de1b 100644 (file)
--- 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 a1734abdeda147e7db80faaf13a20fa0605b6a40..6eca1da693eb8735cdb116d529d84e8585159e9b 100644 (file)
--- 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)));