summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/rpc/xplogin.c11
-rw-r--r--source4/torture/torture.c29
2 files changed, 16 insertions, 24 deletions
diff --git a/source4/torture/rpc/xplogin.c b/source4/torture/rpc/xplogin.c
index 6dcd456fdb..8acf3c4eb7 100644
--- a/source4/torture/rpc/xplogin.c
+++ b/source4/torture/rpc/xplogin.c
@@ -62,12 +62,15 @@ static NTSTATUS after_negprot(struct smbcli_transport **dst_transport,
talloc_set_destructor(transport, destroy_transport);
{
- struct nmb_name calling;
- struct nmb_name called;
+ struct nbt_name calling;
+ struct nbt_name called;
/* send a NBT session request, if applicable */
- make_nmb_name(&calling, my_name, 0x0);
- choose_called_name(&called, dest_host, 0x20);
+ calling.name = my_name;
+ calling.type = NBT_NAME_CLIENT;
+ calling.scope = NULL;
+
+ nbt_choose_called_name(transport, &called, dest_host, NBT_NAME_SERVER);
if (!smbcli_transport_connect(transport, &calling, &called)) {
talloc_free(transport);
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index b2219c617c..63793b41da 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -44,12 +44,15 @@ BOOL torture_showall = False;
static struct smbcli_state *open_nbt_connection(void)
{
- struct nmb_name called, calling;
+ struct nbt_name called, calling;
struct smbcli_state *cli;
const char *host = lp_parm_string(-1, "torture", "host");
- make_nmb_name(&calling, lp_netbios_name(), 0x0);
- choose_called_name(&called, host, 0x20);
+ calling.name = lp_netbios_name();
+ calling.type = NBT_NAME_CLIENT;
+ calling.scope = NULL;
+
+ nbt_choose_called_name(NULL, &called, host, NBT_NAME_SERVER);
cli = smbcli_state_init(NULL);
if (!cli) {
@@ -63,23 +66,9 @@ static struct smbcli_state *open_nbt_connection(void)
}
if (!smbcli_transport_establish(cli, &calling, &called)) {
- /*
- * Well, that failed, try *SMBSERVER ...
- * However, we must reconnect as well ...
- */
- if (!smbcli_socket_connect(cli, host)) {
- printf("Failed to connect with %s\n", host);
- return False;
- }
-
- make_nmb_name(&called, "*SMBSERVER", 0x20);
- if (!smbcli_transport_establish(cli, &calling, &called)) {
- printf("%s rejected the session\n",host);
- printf("We tried with a called name of %s & %s\n",
- host, "*SMBSERVER");
- smbcli_shutdown(cli);
- return NULL;
- }
+ printf("%s rejected the session\n",host);
+ smbcli_shutdown(cli);
+ return NULL;
}
return cli;