sddl: Use C99 initializer for sid_codes

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/libcli/security/sddl.c b/libcli/security/sddl.c
index 9a5a2500e93b0cecde09151e33c63155fbbd8022..935a1d205036c11fcc6360a3f225d6a39c8f5b1b 100644 (file)
--- a/libcli/security/sddl.c
+++ b/libcli/security/sddl.c
@@ -65,55 +65,55 @@ static const struct {
        const char *sid;
        uint32_t rid;
 } sid_codes[] = {
-       { "WD", SID_WORLD },
-
-       { "CO", SID_CREATOR_OWNER },
-       { "CG", SID_CREATOR_GROUP },
-
-       { "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 },
-       { "NS", SID_NT_NETWORK_SERVICE },
-       { "IS", SID_NT_IUSR },
-
-       { "BA", SID_BUILTIN_ADMINISTRATORS },
-       { "BU", SID_BUILTIN_USERS },
-       { "BG", SID_BUILTIN_GUESTS },
-       { "PU", SID_BUILTIN_POWER_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 },
-       { "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 },
-       { "DU", NULL, DOMAIN_RID_USERS },
-       { "DG", NULL, DOMAIN_RID_GUESTS },
-       { "DC", NULL, DOMAIN_RID_DOMAIN_MEMBERS },
-       { "DD", NULL, DOMAIN_RID_DCS },
-       { "CA", NULL, DOMAIN_RID_CERT_ADMINS },
-       { "SA", NULL, DOMAIN_RID_SCHEMA_ADMINS },
-       { "EA", NULL, DOMAIN_RID_ENTERPRISE_ADMINS },
-       { "PA", NULL, DOMAIN_RID_POLICY_ADMINS },
-       { "RO", NULL, DOMAIN_RID_READONLY_DCS },
-       { "RS", NULL, DOMAIN_RID_RAS_SERVERS }
+       { .code = "WD", .sid = SID_WORLD },
+
+       { .code = "CO", .sid = SID_CREATOR_OWNER },
+       { .code = "CG", .sid = SID_CREATOR_GROUP },
+
+       { .code = "NU", .sid = SID_NT_NETWORK },
+       { .code = "IU", .sid = SID_NT_INTERACTIVE },
+       { .code = "SU", .sid = SID_NT_SERVICE },
+       { .code = "AN", .sid = SID_NT_ANONYMOUS },
+       { .code = "ED", .sid = SID_NT_ENTERPRISE_DCS },
+       { .code = "PS", .sid = SID_NT_SELF },
+       { .code = "AU", .sid = SID_NT_AUTHENTICATED_USERS },
+       { .code = "RC", .sid = SID_NT_RESTRICTED },
+       { .code = "SY", .sid = SID_NT_SYSTEM },
+       { .code = "LS", .sid = SID_NT_LOCAL_SERVICE },
+       { .code = "NS", .sid = SID_NT_NETWORK_SERVICE },
+       { .code = "IS", .sid = SID_NT_IUSR },
+
+       { .code = "BA", .sid = SID_BUILTIN_ADMINISTRATORS },
+       { .code = "BU", .sid = SID_BUILTIN_USERS },
+       { .code = "BG", .sid = SID_BUILTIN_GUESTS },
+       { .code = "PU", .sid = SID_BUILTIN_POWER_USERS },
+       { .code = "AO", .sid = SID_BUILTIN_ACCOUNT_OPERATORS },
+       { .code = "SO", .sid = SID_BUILTIN_SERVER_OPERATORS },
+       { .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 = "LA", .sid = NULL, .rid = DOMAIN_RID_ADMINISTRATOR },
+       { .code = "LG", .sid = NULL, .rid = DOMAIN_RID_GUEST },
+       { .code = "LK", .sid = NULL, .rid = DOMAIN_RID_KRBTGT },
+
+       { .code = "ER", .sid = NULL, .rid = DOMAIN_RID_ENTERPRISE_READONLY_DCS },
+       { .code = "DA", .sid = NULL, .rid = DOMAIN_RID_ADMINS },
+       { .code = "DU", .sid = NULL, .rid = DOMAIN_RID_USERS },
+       { .code = "DG", .sid = NULL, .rid = DOMAIN_RID_GUESTS },
+       { .code = "DC", .sid = NULL, .rid = DOMAIN_RID_DOMAIN_MEMBERS },
+       { .code = "DD", .sid = NULL, .rid = DOMAIN_RID_DCS },
+       { .code = "CA", .sid = NULL, .rid = DOMAIN_RID_CERT_ADMINS },
+       { .code = "SA", .sid = NULL, .rid = DOMAIN_RID_SCHEMA_ADMINS },
+       { .code = "EA", .sid = NULL, .rid = DOMAIN_RID_ENTERPRISE_ADMINS },
+       { .code = "PA", .sid = NULL, .rid = DOMAIN_RID_POLICY_ADMINS },
+       { .code = "RO", .sid = NULL, .rid = DOMAIN_RID_READONLY_DCS },
+       { .code = "RS", .sid = NULL, .rid = DOMAIN_RID_RAS_SERVERS }
 };
 
 /*