diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-03-17 22:18:09 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-03-17 22:18:09 +0300 |
| commit | 1095152992d77a7c3e3ad6a4cc1e5a4042ffafac (patch) | |
| tree | ba7a6e80661eb5ec05f779da021c6a823706b5d9 /source3/client | |
| parent | 96ccbc68d81ae0713a5072cbb5815441eef5f3e3 (diff) | |
| parent | 85232b25a2bbf24b2677778653e6017cf329ec46 (diff) | |
| download | samba-1095152992d77a7c3e3ad6a4cc1e5a4042ffafac.tar.gz | |
Merge branch 'master' of git://anonscm.debian.org/pkg-samba/samba
Conflicts:
debian/changelog
debian/patches/series
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index ab46cb80a9..20932cc4e0 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -5307,7 +5307,7 @@ static int do_host_query(const char *query_host) if (cli == NULL) { d_printf("NetBIOS over TCP disabled -- no workgroup available\n"); - return 1; + return 0; } cli_set_timeout(cli, io_timeout*1000); |