Attachment 12765 Details for Bug 12467 – git-am fix for 4.5.x, 4.4.x

[patch] git-am fix for 4.5.x, 4.4.x

bug-12467-4.x (text/plain), 1.69 KB, created by Jeremy Allison on 2016-12-12 22:52:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2016-12-12 22:52:03 UTC

Size: 1.69 KB

patch

obsolete

>From 844b1fb81807014f3a98e042941acf5a87a2e1f8 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Sat, 10 Dec 2016 13:56:18 -0800
>Subject: [PATCH] s3: ntlm_auth: Don't corrupt the output stream with debug
> messages.
>
>Calling programs expect to cleanly read from STDOUT.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12467
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Uri Simchoni <uri@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>(cherry picked from commit 9fbd544b90c2b27985637a9bb3fa520f891f8696)
>---
> source3/utils/ntlm_auth.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
>index 05916d6..84269a1 100644
>--- a/source3/utils/ntlm_auth.c
>+++ b/source3/utils/ntlm_auth.c
>@@ -293,7 +293,7 @@ static char winbind_separator(void)
> 
> 	if (winbindd_request_response(NULL, WINBINDD_INFO, NULL, &response) !=
> 	    NSS_STATUS_SUCCESS) {
>-		d_printf("could not obtain winbind separator!\n");
>+		d_fprintf(stderr, "could not obtain winbind separator!\n");
> 		return *lp_winbind_separator();
> 	}
> 
>@@ -301,7 +301,7 @@ static char winbind_separator(void)
> 	got_sep = True;
> 
> 	if (!sep) {
>-		d_printf("winbind separator was NULL!\n");
>+		d_fprintf(stderr, "winbind separator was NULL!\n");
> 		return *lp_winbind_separator();
> 	}
> 
>@@ -495,7 +495,7 @@ static bool check_plaintext_auth(const char *user, const char *pass,
> 
> 	if (stdout_diagnostics) {
> 		if ((result != NSS_STATUS_SUCCESS) && (response.data.auth.nt_status == 0)) {
>-			d_printf("Reading winbind reply failed! (0x01)\n");
>+			d_fprintf(stderr, "Reading winbind reply failed! (0x01)\n");
> 		}
> 
> 		d_printf("%s: %s (0x%x)\n",
>-- 
>2.8.0.rc3.226.g39d4020
>

Flags:

uri: review+

Actions: View

Attachments on bug 12467: 12759 | 12765