The branch, v4-2-test has been updated
via e914042 s3-smbstatus: Fix exit code of profile output.
via a0b93c9 s3-smbclient: Return success if we listed the shares.
from e1b2b08 s4-dns: dlz-bind: Add trailing '.' to all fqdn strings
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test
- Log -----------------------------------------------------------------
commit e914042badf4505de54b2605a18d52b903079b89
Author: Andreas Schneider <a...@samba.org>
Date: Mon Nov 24 17:46:27 2014 +0100
s3-smbstatus: Fix exit code of profile output.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10961
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(v4-2-test): Karolin Seeger <ksee...@samba.org>
Autobuild-Date(v4-2-test): Thu Nov 27 12:04:19 CET 2014 on sn-devel-104
commit a0b93c9c49ce7bd68b1beda7cd827c851e770fbd
Author: Andreas Schneider <a...@samba.org>
Date: Mon Nov 24 16:26:13 2014 +0100
s3-smbclient: Return success if we listed the shares.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10960
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/client/client.c | 2 +-
source3/utils/status.c | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/client.c b/source3/client/client.c
index c90c450..5d70897 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -5303,7 +5303,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);
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 9cb4d8b..2c21ee4 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -365,6 +365,7 @@ int main(int argc, const char *argv[])
TALLOC_CTX *frame = talloc_stackframe();
int ret = 0;
struct messaging_context *msg_ctx;
+ bool ok;
sec_init();
load_case_tables();
@@ -464,10 +465,12 @@ int main(int argc, const char *argv[])
switch (profile_only) {
case 'P':
/* Dump profile data */
- return status_profile_dump(verbose);
+ ok = status_profile_dump(verbose);
+ return ok ? 0 : 1;
case 'R':
/* Continuously display rate-converted data */
- return status_profile_rates(verbose);
+ ok = status_profile_rates(verbose);
+ return ok ? 0 : 1;
default:
break;
}
--
Samba Shared Repository
