diff options
| author | Volker Lendecke <vl@samba.org> | 2011-05-28 18:57:03 +0200 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2011-05-28 18:06:49 +0200 |
| commit | 5df87913d73ac3c3b6d1893f20038b24db31bd4f (patch) | |
| tree | 4d6f038e0a309cb818d266668228a95b996e6dea | |
| parent | 6bf5d9a61f241d21cf5980f3617c7e27469c4681 (diff) | |
| download | samba-5df87913d73ac3c3b6d1893f20038b24db31bd4f.tar.gz samba-5df87913d73ac3c3b6d1893f20038b24db31bd4f.tar.bz2 samba-5df87913d73ac3c3b6d1893f20038b24db31bd4f.zip | |
s3: Use cli_connect_nb in locktest
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Sat May 28 18:06:49 CEST 2011 on sn-devel-104
| -rw-r--r-- | source3/torture/locktest.c | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c index 95e49756f5..38f05f1894 100644 --- a/source3/torture/locktest.c +++ b/source3/torture/locktest.c @@ -164,10 +164,8 @@ return a connection to a server static struct cli_state *connect_one(char *share, int snum) { struct cli_state *c; - struct nmb_name called, calling; char *server_n; fstring server; - struct sockaddr_storage ss; fstring myname; static int count; NTSTATUS status; @@ -180,42 +178,19 @@ static struct cli_state *connect_one(char *share, int snum) server_n = server; - zero_sockaddr(&ss); - slprintf(myname,sizeof(myname), "lock-%lu-%u", (unsigned long)getpid(), count++); - make_nmb_name(&calling, myname, 0x0); - make_nmb_name(&called , server, 0x20); - - again: - zero_sockaddr(&ss); - /* have to open a new connection */ - if (!(c=cli_initialise())) { - DEBUG(0,("Connection to %s failed\n", server_n)); - return NULL; - } - status = cli_connect(c, server_n, &ss); + status = cli_connect_nb(server_n, NULL, 0, myname, Undefined, &c); if (!NT_STATUS_IS_OK(status)) { - DEBUG(0,("Connection to %s failed. Error %s\n", server_n, nt_errstr(status) )); + DEBUG(0, ("Connection to %s failed. Error %s\n", server_n, + nt_errstr(status))); return NULL; } c->use_kerberos = use_kerberos; - if (!cli_session_request(c, &calling, &called)) { - DEBUG(0,("session request to %s failed\n", called.name)); - cli_shutdown(c); - if (strcmp(called.name, "*SMBSERVER")) { - make_nmb_name(&called , "*SMBSERVER", 0x20); - goto again; - } - return NULL; - } - - DEBUG(4,(" session request ok\n")); - status = cli_negprot(c); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("protocol negotiation failed: %s\n", |