sddl: Remove SDDL SID strings unsupported by Windows

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/libcli/security/sddl.c b/libcli/security/sddl.c
index 5f7d70be9803df01748c99d886c4d96ca7689d9c..5bb65ddfd6b0531afce07a81b651355e95868309 100644 (file)
--- a/libcli/security/sddl.c
+++ b/libcli/security/sddl.c
@@ -116,11 +116,9 @@ static const struct {
        { .code = "PO", .sid = SID_BUILTIN_PRINT_OPERATORS },
        { .code = "BO", .sid = SID_BUILTIN_BACKUP_OPERATORS },
        { .code = "RE", .sid = SID_BUILTIN_REPLICATOR },
-       { .code = "BR", .sid = SID_BUILTIN_RAS_SERVERS },
        { .code = "RU", .sid = SID_BUILTIN_PREW2K },
        { .code = "RD", .sid = SID_BUILTIN_REMOTE_DESKTOP_USERS },
        { .code = "NO", .sid = SID_BUILTIN_NETWORK_CONF_OPERATORS },
-       { .code = "IF", .sid = SID_BUILTIN_INCOMING_FOREST_TRUST },
 
        { .code = "MU", .sid = SID_BUILTIN_PERFMON_USERS },
        { .code = "LU", .sid = SID_BUILTIN_PERFLOG_USERS },
@@ -152,7 +150,6 @@ static const struct {
 
        { .code = "LA", .sid = NULL, .rid = DOMAIN_RID_ADMINISTRATOR },
        { .code = "LG", .sid = NULL, .rid = DOMAIN_RID_GUEST },
-       { .code = "LK", .sid = NULL, .rid = DOMAIN_RID_KRBTGT },
 
        { .code = "DA", .sid = NULL, .rid = DOMAIN_RID_ADMINS },
        { .code = "DU", .sid = NULL, .rid = DOMAIN_RID_USERS },

diff --git a/selftest/knownfail.d/sid-strings b/selftest/knownfail.d/sid-strings
index a9cefedc8a2b2363250e1f61af7c0224de6c442c..69536432585bead4890814dfe6aa628cba358ca5 100644 (file)
--- a/selftest/knownfail.d/sid-strings
+++ b/selftest/knownfail.d/sid-strings
@@ -1,6 +1,3 @@
 ^samba.tests.sid_strings.samba.tests.sid_strings.SidStringTests.test_sid_string_Aa.ad_dc
-^samba.tests.sid_strings.samba.tests.sid_strings.SidStringTests.test_sid_string_BR.ad_dc
-^samba.tests.sid_strings.samba.tests.sid_strings.SidStringTests.test_sid_string_IF.ad_dc
-^samba.tests.sid_strings.samba.tests.sid_strings.SidStringTests.test_sid_string_LK.ad_dc
 ^samba.tests.sid_strings.samba.tests.sid_strings.SidStringTests.test_sid_string_aA.ad_dc
 ^samba.tests.sid_strings.samba.tests.sid_strings.SidStringTests.test_sid_string_aa.ad_dc