diff options
| author | Luk Claes <luk@debian.org> | 2012-05-20 17:54:29 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-05-28 14:49:49 +0200 |
| commit | 764b5e56108362a53acf8f435203dd1e56ecd2ce (patch) | |
| tree | 2433fbabf58b5351da003c163e1c9a85d054f4d9 /source3/utils | |
| parent | 82895ab22fb19fabe43ec29365dbe33da0b917f2 (diff) | |
| download | samba-764b5e56108362a53acf8f435203dd1e56ecd2ce.tar.gz samba-764b5e56108362a53acf8f435203dd1e56ecd2ce.tar.bz2 samba-764b5e56108362a53acf8f435203dd1e56ecd2ce.zip | |
s3:libsmb: get rid of cli_negprot
Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc.c | 5 | ||||
| -rw-r--r-- | source3/utils/net_time.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index daae7f449e..49b405f75f 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -43,7 +43,7 @@ #include "libsmb/clirap.h" #include "nsswitch/libwbclient/wbclient.h" #include "passdb.h" -#include "libcli/smb/smbXcli_base.h" +#include "../libcli/smb/smbXcli_base.h" static int net_mode_share; static NTSTATUS sync_files(struct copy_clistate *cp_clistate, const char *mask); @@ -7105,7 +7105,8 @@ bool net_rpc_check(struct net_context *c, unsigned flags) if (!NT_STATUS_IS_OK(status)) { return false; } - status = cli_negprot(cli, PROTOCOL_NT1); + status = smbXcli_negprot(cli->conn, cli->timeout, PROTOCOL_CORE, + PROTOCOL_NT1); if (!NT_STATUS_IS_OK(status)) goto done; if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_NT1) diff --git a/source3/utils/net_time.c b/source3/utils/net_time.c index 979d29cf91..847b4fe445 100644 --- a/source3/utils/net_time.c +++ b/source3/utils/net_time.c @@ -41,7 +41,8 @@ static time_t cli_servertime(const char *host, goto done; } - status = cli_negprot(cli, PROTOCOL_NT1); + status = smbXcli_negprot(cli->conn, cli->timeout, PROTOCOL_CORE, + PROTOCOL_NT1); if (!NT_STATUS_IS_OK(status)) { fprintf(stderr, _("Protocol negotiation failed: %s\n"), nt_errstr(status)); |