[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  e9f0852 s3: lib: util: Ensure we read a hex number as %x, not %u.
      from  435ddd8 s3:winbindd: make sure we remove pending io requests before closing client sockets

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e9f08528af0a5420d6a5fa3799b75c6058b6775f
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 21 12:35:43 2015 +0200

    s3: lib: util: Ensure we read a hex number as %x, not %u.
    
    Based on a patch from Zoe O'Connell <zoe at metail.com>
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11068
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Jim McDonough <jmcd at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu May 21 15:34:59 CEST 2015 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/util_sd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/util_sd.c b/source3/lib/util_sd.c
index bfd5dbb..8065a0f 100644
--- a/source3/lib/util_sd.c
+++ b/source3/lib/util_sd.c
@@ -501,7 +501,7 @@ 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);


-- 
Samba Shared Repository