s4:security/sddl - rework of the security descriptor abbreviations

- Reoder them
- Add some new ones (needed for the security descriptor in the provision script)

1 files changed, 33 insertions, 28 deletions

diff --git a/source4/libcli/security/sddl.c b/source4/libcli/security/sddl.c
index 7f4a6fdcd7..2244a3d3ed 100644
--- a/source4/libcli/security/sddl.c
+++ b/source4/libcli/security/sddl.c
@@ -65,49 +65,54 @@ static const struct {
 	const char *sid;
 	uint32_t rid;
 } sid_codes[] = {
-	{ "AO", SID_BUILTIN_ACCOUNT_OPERATORS },
-	{ "BA", SID_BUILTIN_ADMINISTRATORS },
-	{ "RU", SID_BUILTIN_PREW2K },
-	{ "PO", SID_BUILTIN_PRINT_OPERATORS },
-
-	{ "AU", SID_NT_AUTHENTICATED_USERS },
-	{ "SY", SID_NT_SYSTEM },
-	{ "PS", SID_NT_SELF },
 	{ "WD", SID_WORLD },
-	{ "ED", SID_NT_ENTERPRISE_DCS },
 
 	{ "CO", SID_CREATOR_OWNER },
 	{ "CG", SID_CREATOR_GROUP },
 
-	{ "AN", SID_NT_ANONYMOUS },
-	{ "BG", SID_BUILTIN_GUESTS },
-	{ "BO", SID_BUILTIN_BACKUP_OPERATORS },
-	{ "BU", SID_BUILTIN_USERS },
+	{ "NU", SID_NT_NETWORK },
 	{ "IU", SID_NT_INTERACTIVE },
+	{ "SU", SID_NT_SERVICE },
+	{ "AN", SID_NT_ANONYMOUS },
+	{ "ED", SID_NT_ENTERPRISE_DCS },
+	{ "PS", SID_NT_SELF },
+	{ "AU", SID_NT_AUTHENTICATED_USERS },
+	{ "RC", SID_NT_RESTRICTED },
+	{ "SY", SID_NT_SYSTEM },
 	{ "LS", SID_NT_LOCAL_SERVICE },
-	{ "NO", SID_BUILTIN_NETWORK_CONF_OPERATORS },
 	{ "NS", SID_NT_NETWORK_SERVICE },
-	{ "NU", SID_NT_NETWORK },
+
+	{ "BA", SID_BUILTIN_ADMINISTRATORS },
+	{ "BU", SID_BUILTIN_USERS },
+	{ "BG", SID_BUILTIN_GUESTS },
 	{ "PU", SID_BUILTIN_POWER_USERS },
-	{ "RC", SID_NT_RESTRICTED },
-	{ "RD", SID_BUILTIN_REMOTE_DESKTOP_USERS },
+	{ "AO", SID_BUILTIN_ACCOUNT_OPERATORS },
+	{ "SO", SID_BUILTIN_SERVER_OPERATORS },
+	{ "PO", SID_BUILTIN_PRINT_OPERATORS },
+	{ "BO", SID_BUILTIN_BACKUP_OPERATORS },
 	{ "RE", SID_BUILTIN_REPLICATOR },
-	{ "SO", SID_BUILTIN_ACCOUNT_OPERATORS },
-	{ "SU", SID_NT_SERVICE },
+	{ "BR", SID_BUILTIN_RAS_SERVERS },
+	{ "RU", SID_BUILTIN_PREW2K },
+	{ "RD", SID_BUILTIN_REMOTE_DESKTOP_USERS },
+	{ "NO", SID_BUILTIN_NETWORK_CONF_OPERATORS },
+	{ "IF", SID_BUILTIN_INCOMING_FOREST_TRUST },
+
+	{ "LA", NULL, DOMAIN_RID_ADMINISTRATOR },
+	{ "LG", NULL, DOMAIN_RID_GUEST },
+	{ "LK", NULL, DOMAIN_RID_KRBTGT },
 
+	{ "ER", NULL, DOMAIN_RID_ENTERPRISE_READONLY_DCS },
 	{ "DA", NULL, DOMAIN_RID_ADMINS },
-	{ "EA", NULL, DOMAIN_RID_ENTERPRISE_ADMINS },
-	{ "DD", NULL, DOMAIN_RID_DCS },
 	{ "DU", NULL, DOMAIN_RID_USERS },
-	{ "CA", NULL, DOMAIN_RID_CERT_ADMINS },
-
-	{ "DC", NULL, DOMAIN_RID_DOMAIN_MEMBERS },
 	{ "DG", NULL, DOMAIN_RID_GUESTS },
-	{ "LA", NULL, DOMAIN_RID_ADMINISTRATOR },
-	{ "LG", NULL, DOMAIN_RID_GUEST },
-	{ "PA", NULL, DOMAIN_RID_POLICY_ADMINS },
+	{ "DC", NULL, DOMAIN_RID_DOMAIN_MEMBERS },
+	{ "DD", NULL, DOMAIN_RID_DCS },
+	{ "CA", NULL, DOMAIN_RID_CERT_ADMINS },
 	{ "SA", NULL, DOMAIN_RID_SCHEMA_ADMINS },
-	{ "RS", NULL, DOMAIN_RID_RAS_SERVERS },
+	{ "EA", NULL, DOMAIN_RID_ENTERPRISE_ADMINS },
+	{ "PA", NULL, DOMAIN_RID_POLICY_ADMINS },
+	{ "RO", NULL, DOMAIN_RID_READONLY_DCS },
+	{ "RS", NULL, DOMAIN_RID_RAS_SERVERS }
 };
 
 /*