summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-05-28 21:01:59 +0200
committerVolker Lendecke <vlendec@samba.org>2011-05-28 21:57:04 +0200
commit797316ae9797f7567e01f853effbd87d98b2abbb (patch)
treebfca8356eef7c3edf1b0609464ce97485f0285e9
parent230cb3b90435d951beb62d8dd5230f74e178f921 (diff)
downloadsamba-797316ae9797f7567e01f853effbd87d98b2abbb.tar.gz
s3: Use cli_connect_nb in net_rpc_check
Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Sat May 28 21:57:04 CEST 2011 on sn-devel-104
-rw-r--r--source3/utils/net_rpc.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index b705f6af97d..a3ce5316d77 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -7091,16 +7091,11 @@ bool net_rpc_check(struct net_context *c, unsigned flags)
if (!net_find_server(c, NULL, flags, &server_ss, &server_name))
return false;
- if ((cli = cli_initialise()) == NULL) {
+ status = cli_connect_nb(server_name, &server_ss, 0, 0x20,
+ global_myname(), Undefined, &cli);
+ if (!NT_STATUS_IS_OK(status)) {
return false;
}
-
- status = cli_connect(cli, server_name, &server_ss);
- if (!NT_STATUS_IS_OK(status))
- goto done;
- if (!attempt_netbios_session_request(&cli, global_myname(),
- server_name, &server_ss))
- goto done;
status = cli_negprot(cli);
if (!NT_STATUS_IS_OK(status))
goto done;