The branch, master has been updated
via 064e17c0 net: groupmap cleanup should not delete BUILTIN mappings
from 6539cc8 lib/util/run_cmd: use a cleanup function instead of a
destructor
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 064e17c0d6934f685c075abe0cf4913fa20d3a94
Author: Ralph Boehme <[email protected]>
Date: Sat Sep 30 08:45:41 2017 +0200
net: groupmap cleanup should not delete BUILTIN mappings
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13065
Signed-off-by: Ralph Boehme <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Mon Oct 2 15:17:00 CEST 2017 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source3/utils/net_groupmap.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index b8c81de..2b75dd2 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));
--
Samba Shared Repository
