r6933: Add a couple of helper functions for creating nbt names.

(This used to be commit b896daf11c3efb1b3ca939575da9dab82b395777)

diff --git a/source4/client/client.c b/source4/client/client.c
index 5981812eb77948ca9867ad37b8d9f2060ec81395..34d0fc20f1a8dbd52c377e5557471ad4b64e5f2f 100644 (file)
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -3274,9 +3274,7 @@ static int do_message_op(void)
        struct nbt_name called, calling;
        const char *server_name;
 
-       calling.name = lp_netbios_name();
-       calling.type = NBT_NAME_CLIENT;
-       calling.scope = NULL;
+       make_nbt_name_client(&calling, lp_netbios_name());
 
        nbt_choose_called_name(NULL, &called, desthost, name_type);
 

diff --git a/source4/libcli/composite/connect.c b/source4/libcli/composite/connect.c
index 0da71df99280d51414c223157ceccc6e339e6399..526eee8cb8c651939ca2c49d3ac6edd5c64790b1 100644 (file)
--- a/source4/libcli/composite/connect.c
+++ b/source4/libcli/composite/connect.c
@@ -213,9 +213,7 @@ static NTSTATUS connect_socket(struct composite_context *c,
        state->transport = smbcli_transport_init(state->sock, state, True);
        NT_STATUS_HAVE_NO_MEMORY(state->transport);
 
-       calling.name = cli_credentials_get_workstation(io->in.credentials);
-       calling.type = NBT_NAME_CLIENT;
-       calling.scope = NULL;
+       make_nbt_name_client(&calling, cli_credentials_get_workstation(io->in.credentials));
 
        nbt_choose_called_name(state, &called, io->in.called_name, NBT_NAME_SERVER);
 
@@ -349,9 +347,7 @@ struct composite_context *smb_composite_connect_send(struct smb_composite_connec
        c->event_ctx = talloc_reference(c, state->sock->event.ctx);
        c->private = state;
 
-       name.name = io->in.dest_host;
-       name.type = NBT_NAME_SERVER;
-       name.scope = NULL;
+       make_nbt_name_server(&name, io->in.dest_host);
 
        state->creq = resolve_name_send(&name, c->event_ctx);
        if (state->creq == NULL) goto failed;

diff --git a/source4/libcli/dgram/netlogon.c b/source4/libcli/dgram/netlogon.c
index 6e939725d0aff855f59550a496ddae3bc731a566..9d3a0dbed988250e505ae23d8e49d4f349dd1d69 100644 (file)
--- a/source4/libcli/dgram/netlogon.c
+++ b/source4/libcli/dgram/netlogon.c
@@ -79,9 +79,7 @@ NTSTATUS dgram_mailslot_netlogon_reply(struct nbt_dgram_socket *dgmsock,
                return status;
        }
 
-       myname.name = lp_netbios_name();
-       myname.type = NBT_NAME_CLIENT;
-       myname.scope = NULL;
+       make_nbt_name_client(&myname, lp_netbios_name());
 
        status = dgram_mailslot_send(dgmsock, DGRAM_DIRECT_UNIQUE, 
                                     mailslot_name,

diff --git a/source4/libcli/dgram/ntlogon.c b/source4/libcli/dgram/ntlogon.c
index 38651a4085a27b9faf838d0f018612f398a9563c..e4a24b0591b3be7338415f29caf126e905205451 100644 (file)
--- a/source4/libcli/dgram/ntlogon.c
+++ b/source4/libcli/dgram/ntlogon.c
@@ -79,9 +79,7 @@ NTSTATUS dgram_mailslot_ntlogon_reply(struct nbt_dgram_socket *dgmsock,
                return status;
        }
 
-       myname.name = lp_netbios_name();
-       myname.type = NBT_NAME_CLIENT;
-       myname.scope = NULL;
+       make_nbt_name_client(&myname, lp_netbios_name());
 
        status = dgram_mailslot_send(dgmsock, DGRAM_DIRECT_UNIQUE, 
                                     mailslot_name,

diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index 82268dc953e3b64eb0f60cdd09a2b34429cfe366..a3bbd609200a0f8a95c616632c40fdf1e25201f3 100644 (file)
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -181,3 +181,26 @@ NTSTATUS resolve_name(struct nbt_name *name, TALLOC_CTX *mem_ctx, const char **r
        struct composite_context *c = resolve_name_send(name, NULL);
        return resolve_name_recv(c, mem_ctx, reply_addr);
 }
+
+/* Initialise a struct nbt_name with a NULL scope */
+
+void make_nbt_name(struct nbt_name *nbt, const char *name, int type)
+{
+       nbt->name = name;
+       nbt->scope = NULL;
+       nbt->type = type;
+}
+
+/* Initialise a struct nbt_name with a NBT_NAME_CLIENT (0x00) name */
+
+void make_nbt_name_client(struct nbt_name *nbt, const char *name)
+{
+       make_nbt_name(nbt, name, NBT_NAME_CLIENT);
+}
+
+/* Initialise a struct nbt_name with a NBT_NAME_SERVER (0x20) name */
+
+void make_nbt_name_server(struct nbt_name *nbt, const char *name)
+{
+       make_nbt_name(nbt, name, NBT_NAME_SERVER);
+}

diff --git a/source4/libcli/wins/winsrepl.c b/source4/libcli/wins/winsrepl.c
index 7a3ce72b91c0a42348152def7cfe0b1e34af44c1..65b713202f0861d119f9d7769b2f69aa8c3aff45 100644 (file)
--- a/source4/libcli/wins/winsrepl.c
+++ b/source4/libcli/wins/winsrepl.c
@@ -602,9 +602,7 @@ static NTSTATUS wrepl_extract_name(struct nbt_name *name,
        }
 
        if (len < 17) {
-               name->name = talloc_strndup(mem_ctx, namebuf, len);
-               name->type = NBT_NAME_CLIENT;
-               name->scope = NULL;
+               make_nbt_name_client(name, talloc_strndup(mem_ctx, namebuf, len));
                return NT_STATUS_OK;
        }
 

diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c
index 1f1812e261b67bcf7f77840abdc74a424d1d10af..82dc06a0f6f84ac94c6101b5e2d8b2804a56240b 100644 (file)
--- a/source4/libnet/libnet_rpc.c
+++ b/source4/libnet/libnet_rpc.c
@@ -43,9 +43,7 @@ static NTSTATUS libnet_find_pdc_generic(struct libnet_context *ctx, TALLOC_CTX *
                return NT_STATUS_OK;
        }
 
-       name.name = r->generic.in.domain_name;
-       name.type = NBT_NAME_PDC;
-       name.scope = NULL;
+       make_nbt_name(&name, r->generic.in.domain_name, NBT_NAME_PDC);
 
        status = resolve_name(&name, mem_ctx, &address);
        if (!NT_STATUS_IS_OK(status)) {

diff --git a/source4/torture/ldap/cldapbench.c b/source4/torture/ldap/cldapbench.c
index 8eaddc78f98bc3cfccdc59d98427ad8134d9c389..0a021dacceed380c3162c86dd09834dc88c13633 100644 (file)
--- a/source4/torture/ldap/cldapbench.c
+++ b/source4/torture/ldap/cldapbench.c
@@ -108,9 +108,7 @@ BOOL torture_bench_cldap(void)
        NTSTATUS status;
        BOOL ret = True;
        
-       name.name = lp_parm_string(-1, "torture", "host");
-       name.type = NBT_NAME_SERVER;
-       name.scope = NULL;
+       make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
 
        /* do an initial name resolution to find its IP */
        status = resolve_name(&name, mem_ctx, &address);

diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index 5726e684715f2a723207b08e88e94d05b01e34ca..d5fa014ce1bb218b461c58cc842fd8e5234e587f 100644 (file)
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -92,9 +92,7 @@ static BOOL nbt_test_netlogon(TALLOC_CTX *mem_ctx,
        logon.req.pdc.lmnt_token    = 0xFFFF;
        logon.req.pdc.lm20_token    = 0xFFFF;
 
-       myname.name = TEST_NAME;
-       myname.type = NBT_NAME_CLIENT;
-       myname.scope = NULL;
+       make_nbt_name_client(&myname, TEST_NAME);
 
        status = dgram_mailslot_netlogon_send(dgmsock, &name, address, 
                                              0, &myname, &logon);
@@ -154,9 +152,7 @@ static BOOL nbt_test_netlogon2(TALLOC_CTX *mem_ctx,
        logon.req.pdc2.lmnt_token    = 0xFFFF;
        logon.req.pdc2.lm20_token    = 0xFFFF;
 
-       myname.name = TEST_NAME;
-       myname.type = NBT_NAME_CLIENT;
-       myname.scope = NULL;
+       make_nbt_name_client(&myname, TEST_NAME);
 
        status = dgram_mailslot_netlogon_send(dgmsock, &name, address, 
                                              0, &myname, &logon);
@@ -257,10 +253,7 @@ static BOOL nbt_test_ntlogon(TALLOC_CTX *mem_ctx,
        logon.req.logon.lmnt_token    = 0xFFFF;
        logon.req.logon.lm20_token    = 0xFFFF;
 
-
-       myname.name = TEST_NAME;
-       myname.type = NBT_NAME_CLIENT;
-       myname.scope = NULL;
+       make_nbt_name_client(&myname, TEST_NAME);
 
        status = dgram_mailslot_ntlogon_send(dgmsock, &name, address, 
                                              0, &myname, &logon);

diff --git a/source4/torture/nbt/query.c b/source4/torture/nbt/query.c
index a9141f443145702f8c8b58aba28bf8757fc17145..3764596f3f16559192c89d745c2c59c9fdbeff33 100644 (file)
--- a/source4/torture/nbt/query.c
+++ b/source4/torture/nbt/query.c
@@ -110,9 +110,7 @@ BOOL torture_bench_nbt(void)
        NTSTATUS status;
        BOOL ret = True;
        
-       name.name = lp_parm_string(-1, "torture", "host");
-       name.type = NBT_NAME_SERVER;
-       name.scope = NULL;
+       make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
 
        /* do an initial name resolution to find its IP */
        status = resolve_name(&name, mem_ctx, &address);

diff --git a/source4/torture/nbt/register.c b/source4/torture/nbt/register.c
index e9b98663a59155386de81a1cd9e17bda4cdd1cc7..463783e1c996f4aa3bbf6179f34a4f33b063ccf8 100644 (file)
--- a/source4/torture/nbt/register.c
+++ b/source4/torture/nbt/register.c
@@ -160,9 +160,7 @@ BOOL torture_nbt_register(void)
        NTSTATUS status;
        BOOL ret = True;
        
-       name.name = strupper_talloc(mem_ctx, lp_parm_string(-1, "torture", "host"));
-       name.type = NBT_NAME_SERVER;
-       name.scope = NULL;
+       make_nbt_name_server(&name, strupper_talloc(mem_ctx, lp_parm_string(-1, "torture", "host")));
 
        /* do an initial name resolution to find its IP */
        status = resolve_name(&name, mem_ctx, &address);

diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c
index f92a23f7324abab9be421ed27b0bf21e49b0b2bd..b099f48476c4821bc6be868e9bea912bf77f24ad 100644 (file)
--- a/source4/torture/nbt/wins.c
+++ b/source4/torture/nbt/wins.c
@@ -345,9 +345,7 @@ BOOL torture_nbt_wins(void)
        NTSTATUS status;
        BOOL ret = True;
        
-       name.name = lp_parm_string(-1, "torture", "host");
-       name.type = NBT_NAME_SERVER;
-       name.scope = NULL;
+       make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
 
        /* do an initial name resolution to find its IP */
        status = resolve_name(&name, mem_ctx, &address);

diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c
index 54f730ce84ad21673f61a430ac068a02d306d67a..76763d3bf0f6a79a056685c29a2a3460549112b6 100644 (file)
--- a/source4/torture/nbt/winsbench.c
+++ b/source4/torture/nbt/winsbench.c
@@ -276,9 +276,7 @@ BOOL torture_bench_wins(void)
        NTSTATUS status;
        BOOL ret = True;
        
-       name.name = lp_parm_string(-1, "torture", "host");
-       name.type = NBT_NAME_SERVER;
-       name.scope = NULL;
+       make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
 
        /* do an initial name resolution to find its IP */
        status = resolve_name(&name, mem_ctx, &address);

diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 5ba6003b789b0657f0c46bdb99fb780a51bcb550..4e91deb84a775509dbcf9d3e71a1ac0d2e69544e 100644 (file)
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -124,9 +124,7 @@ BOOL torture_nbt_winsreplication(void)
        NTSTATUS status;
        BOOL ret = True;
        
-       name.name = lp_parm_string(-1, "torture", "host");
-       name.type = NBT_NAME_SERVER;
-       name.scope = NULL;
+       make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
 
        /* do an initial name resolution to find its IP */
        status = resolve_name(&name, mem_ctx, &address);

diff --git a/source4/torture/rpc/xplogin.c b/source4/torture/rpc/xplogin.c
index d54dfdf310cf04a4b82f2a6c2a9c0818de1dee7f..235ac02e38b5aca0182ac04aa024cbb46a6b70f4 100644 (file)
--- a/source4/torture/rpc/xplogin.c
+++ b/source4/torture/rpc/xplogin.c
@@ -56,9 +56,7 @@ static NTSTATUS after_negprot(struct smbcli_transport **dst_transport,
                struct nbt_name called;
 
                /* send a NBT session request, if applicable */
-               calling.name = my_name;
-               calling.type = NBT_NAME_CLIENT;
-               calling.scope = NULL;
+               make_nbt_name_client(&calling, my_name);
 
                nbt_choose_called_name(transport, &called, dest_host, NBT_NAME_SERVER);
 

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index f5e52c53581489bff6a3635667b848d888a458e2..b7e216831973f013262343a92c2ff418c2cd89d7 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -49,9 +49,7 @@ static struct smbcli_state *open_nbt_connection(void)
        struct smbcli_state *cli;
        const char *host = lp_parm_string(-1, "torture", "host");
 
-       calling.name = lp_netbios_name();
-       calling.type = NBT_NAME_CLIENT;
-       calling.scope = NULL;
+       make_nbt_name_client(&calling, lp_netbios_name());
 
        nbt_choose_called_name(NULL, &called, host, NBT_NAME_SERVER);