Attachment 10459 Details for Bug 10961 – v4-1-test patch

[patch] v4-1-test patch

0002-s3-smbstatus-Fix-exit-code-of-profile-output.patch (text/plain), 1.23 KB, created by Andreas Schneider on 2014-11-25 14:07:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2014-11-25 14:07:39 UTC

Size: 1.23 KB

patch

obsolete

>From 99911592b5ea0986c4f297c5fc817bd7701268cf Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Mon, 24 Nov 2014 17:46:27 +0100
>Subject: [PATCH 2/2] s3-smbstatus: Fix exit code of profile output.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10961
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>---
> source3/utils/status.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/source3/utils/status.c b/source3/utils/status.c
>index be7c52f..9ce92aa 100644
>--- a/source3/utils/status.c
>+++ b/source3/utils/status.c
>@@ -363,6 +363,7 @@ static void print_notify_recs(const char *path,
> 	TALLOC_CTX *frame = talloc_stackframe();
> 	int ret = 0;
> 	struct messaging_context *msg_ctx;
>+	bool ok;
> 
> 	sec_init();
> 	load_case_tables();
>@@ -462,10 +463,12 @@ static void print_notify_recs(const char *path,
> 	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;
> 	}
>-- 
>2.1.2
>

Flags:

jra: review+

Actions: View

Attachments on bug 10961: 10457 | 10459