Attachment 11082 Details for Bug 11068 – git-am fix for 4.1.next.

[patch] git-am fix for 4.1.next.

0001-s3-smbcacls-Ensure-we-read-a-hex-number-as-x-not-u.patch (text/plain), 978 bytes, created by Jeremy Allison on 2015-05-22 07:28:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2015-05-22 07:28:11 UTC

Size: 978 bytes

patch

obsolete

>From 766511752ce48a9abe7f8df6be9388b792d386b0 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 22 May 2015 09:24:56 +0200
>Subject: [PATCH] s3: smbcacls: Ensure we read a hex number as %x, not %u.
>
>Based on a patch from Zoe O'Connell <zoe@metail.com>
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11068
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Jim McDonough <jmcd@samba.org>
>---
> source3/utils/smbcacls.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
>index 23a1192..d8e7985 100644
>--- a/source3/utils/smbcacls.c
>+++ b/source3/utils/smbcacls.c
>@@ -571,7 +571,7 @@ static bool parse_ace(struct cli_state *cli, struct security_ace *ace,
> 	}
> 
> 	if (strncmp(tok, "0x", 2) == 0) {
>-		if (sscanf(tok, "%u", &amask) != 1) {
>+		if (sscanf(tok, "%x", &amask) != 1) {
> 			printf("ACE '%s': bad hex number at '%s'\n",
> 				orig_str, tok);
> 			SAFE_FREE(str);
>-- 
>2.1.4
>

Flags:

jmcd: review+

Actions: View

Attachments on bug 11068: 10655 | 11081 | 11082