Attachment 13648 Details for Bug 13065 – Patch for 4.6 and 4.7 cherry-picked from master

[patch] Patch for 4.6 and 4.7 cherry-picked from master

bug13065-v46,v47.patch (text/plain), 1.26 KB, created by Ralph Böhme on 2017-10-04 07:40:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2017-10-04 07:40:34 UTC

Size: 1.26 KB

patch

obsolete

>From c0122e5e126e334fd3ec88b68ba888b8d8a72c3e Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Sat, 30 Sep 2017 08:45:41 +0200
>Subject: [PATCH] net: groupmap cleanup should not delete BUILTIN mappings
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=13065
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>
>Autobuild-User(master): Volker Lendecke <vl@samba.org>
>Autobuild-Date(master): Mon Oct  2 15:17:00 CEST 2017 on sn-devel-144
>
>(cherry picked from commit 064e17c0d6934f685c075abe0cf4913fa20d3a94)
>---
> source3/utils/net_groupmap.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
>index b8c81de5bf1..2b75dd21a90 100644
>--- a/source3/utils/net_groupmap.c
>+++ b/source3/utils/net_groupmap.c
>@@ -764,7 +764,9 @@ static int net_groupmap_cleanup(struct net_context *c, int argc, const char **ar
> 			printf(_("Group %s is not mapped\n"),
> 				maps[i]->nt_name);
> 
>-		if (!sid_check_is_in_our_sam(&maps[i]->sid)) {
>+		if (!sid_check_is_in_our_sam(&maps[i]->sid) &&
>+		    !sid_check_is_in_builtin(&maps[i]->sid))
>+		{
> 			printf(_("Deleting mapping for NT Group %s, sid %s\n"),
> 				maps[i]->nt_name,
> 				sid_string_tos(&maps[i]->sid));
>-- 
>2.13.5
>

Flags:

vl: review+

Actions: View

Attachments on bug 13065: 13648