diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-19 12:03:17 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-19 12:03:17 +0000 |
| commit | 263036a798b4c431f03dae20d33f90585d2b0cab (patch) | |
| tree | 1a8af7fae50ac0b81fb0da9149b1eb92fb2706b0 /source3/utils | |
| parent | e0672ae29bcd345bdf0fec96844f658ffd941039 (diff) | |
| parent | f87da49830960aebe4ffa551e7e1f16330d28cca (diff) | |
| download | samba-263036a798b4c431f03dae20d33f90585d2b0cab.tar.gz samba-263036a798b4c431f03dae20d33f90585d2b0cab.tar.bz2 samba-263036a798b4c431f03dae20d33f90585d2b0cab.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into pyregistry
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc.c | 3 | ||||
| -rw-r--r-- | source3/utils/net_time.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index f69d3f9012..5c83b590c1 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -6326,7 +6326,8 @@ bool net_rpc_check(struct net_context *c, unsigned flags) if (!attempt_netbios_session_request(&cli, global_myname(), server_name, &server_ss)) goto done; - if (!cli_negprot(cli)) + status = cli_negprot(cli); + if (!NT_STATUS_IS_OK(status)) goto done; if (cli->protocol < PROTOCOL_NT1) goto done; diff --git a/source3/utils/net_time.c b/source3/utils/net_time.c index f569538fac..8be9ed922c 100644 --- a/source3/utils/net_time.c +++ b/source3/utils/net_time.c @@ -51,8 +51,10 @@ static time_t cli_servertime(const char *host, struct sockaddr_storage *pss, int fprintf(stderr,"Session request failed\n"); goto done; } - if (!cli_negprot(cli)) { - fprintf(stderr,"Protocol negotiation failed\n"); + status = cli_negprot(cli); + if (!NT_STATUS_IS_OK(status)) { + fprintf(stderr, "Protocol negotiation failed: %s\n", + nt_errstr(status)); goto done; } |