Author: vlendec Date: 2006-05-16 16:07:41 +0000 (Tue, 16 May 2006) New Revision: 15637
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15637 Log: Ugly as hell and needs something better: Adapt the static SIDs to the new representation in libndr/security.h. Volker Modified: branches/tmp/trunk-libndr-unixinfo/source/lib/util_sid.c Changeset: Modified: branches/tmp/trunk-libndr-unixinfo/source/lib/util_sid.c =================================================================== --- branches/tmp/trunk-libndr-unixinfo/source/lib/util_sid.c 2006-05-16 15:45:14 UTC (rev 15636) +++ branches/tmp/trunk-libndr-unixinfo/source/lib/util_sid.c 2006-05-16 16:07:41 UTC (rev 15637) @@ -30,57 +30,81 @@ */ +static uint32_t global_sid_World_Domain_subauths[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_World_Domain = /* Everyone domain */ -{ 1, 0, {0,0,0,0,0,1}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 0, {0,0,0,0,0,1}, global_sid_World_Domain_subauths }; +static uint32_t global_sid_World_subauths[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_World = /* Everyone */ -{ 1, 1, {0,0,0,0,0,1}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 1, {0,0,0,0,0,1}, global_sid_World_subauths }; +static uint32_t global_sid_Creator_Owner_Domain_subauths[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Creator_Owner_Domain = /* Creator Owner domain */ -{ 1, 0, {0,0,0,0,0,3}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 0, {0,0,0,0,0,3}, global_sid_Creator_Owner_Domain_subauths }; +static uint32_t global_sid_NT_Authority_subauths[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_NT_Authority = /* NT Authority */ -{ 1, 0, {0,0,0,0,0,5}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 0, {0,0,0,0,0,5}, global_sid_NT_Authority_subauths }; +static uint32_t global_sid_System_subauths[] = {18,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_System = /* System */ -{ 1, 1, {0,0,0,0,0,5}, {18,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 1, {0,0,0,0,0,5}, global_sid_System_subauths }; +static uint32_t global_sid_NULL_subauths[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_NULL = /* NULL sid */ -{ 1, 1, {0,0,0,0,0,0}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 1, {0,0,0,0,0,0}, global_sid_NULL_subauths }; +static uint32_t global_sid_Authenticated_Users_subauths[] = {11,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Authenticated_Users = /* All authenticated rids */ -{ 1, 1, {0,0,0,0,0,5}, {11,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 1, {0,0,0,0,0,5}, global_sid_Authenticated_Users_subauths }; +static uint32_t global_sid_Network_subauths[] = {2,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Network = /* Network rids */ -{ 1, 1, {0,0,0,0,0,5}, {2,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 1, {0,0,0,0,0,5}, global_sid_Network_subauths }; +static uint32_t global_sid_Creator_Owner_subauths[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Creator_Owner = /* Creator Owner */ -{ 1, 1, {0,0,0,0,0,3}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 1, {0,0,0,0,0,3}, global_sid_Creator_Owner_subauths }; +static uint32_t global_sid_Creator_Group_subauths[] = {1,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Creator_Group = /* Creator Group */ -{ 1, 1, {0,0,0,0,0,3}, {1,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 1, {0,0,0,0,0,3}, global_sid_Creator_Group_subauths }; +static uint32_t global_sid_Anonymous_subauths[] = {7,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Anonymous = /* Anonymous login */ -{ 1, 1, {0,0,0,0,0,5}, {7,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 1, {0,0,0,0,0,5}, global_sid_Anonymous_subauths }; +static uint32_t global_sid_Builtin_subauths[] = {32,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Builtin = /* Local well-known domain */ -{ 1, 1, {0,0,0,0,0,5}, {32,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 1, {0,0,0,0,0,5}, global_sid_Builtin_subauths }; +static uint32_t global_sid_Builtin_Administrators_subauths[] = {32,544,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Builtin_Administrators = /* Builtin administrators */ -{ 1, 2, {0,0,0,0,0,5}, {32,544,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 2, {0,0,0,0,0,5}, global_sid_Builtin_Administrators_subauths }; +static uint32_t global_sid_Builtin_Users_subauths[] = {32,545,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Builtin_Users = /* Builtin users */ -{ 1, 2, {0,0,0,0,0,5}, {32,545,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 2, {0,0,0,0,0,5}, global_sid_Builtin_Users_subauths }; +static uint32_t global_sid_Builtin_Guests_subauths[] = {32,546,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Builtin_Guests = /* Builtin guest users */ -{ 1, 2, {0,0,0,0,0,5}, {32,546,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 2, {0,0,0,0,0,5}, global_sid_Builtin_Guests_subauths }; +static uint32_t global_sid_Builtin_Power_Users_subauths[] = {32,547,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Builtin_Power_Users = /* Builtin power users */ -{ 1, 2, {0,0,0,0,0,5}, {32,547,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 2, {0,0,0,0,0,5}, global_sid_Builtin_Power_Users_subauths }; +static uint32_t global_sid_Builtin_Account_Operators_subauths[] = {32,548,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Builtin_Account_Operators = /* Builtin account operators */ -{ 1, 2, {0,0,0,0,0,5}, {32,548,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 2, {0,0,0,0,0,5}, global_sid_Builtin_Account_Operators_subauths }; +static uint32_t global_sid_Builtin_Server_Operators_subauths[] = {32,549,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Builtin_Server_Operators = /* Builtin server operators */ -{ 1, 2, {0,0,0,0,0,5}, {32,549,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 2, {0,0,0,0,0,5}, global_sid_Builtin_Server_Operators_subauths }; +static uint32_t global_sid_Builtin_Print_Operators_subauths[] = {32,550,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Builtin_Print_Operators = /* Builtin print operators */ -{ 1, 2, {0,0,0,0,0,5}, {32,550,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 2, {0,0,0,0,0,5}, global_sid_Builtin_Print_Operators_subauths }; +static uint32_t global_sid_Builtin_Backup_Operators_subauths[] = {32,551,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Builtin_Backup_Operators = /* Builtin backup operators */ -{ 1, 2, {0,0,0,0,0,5}, {32,551,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 2, {0,0,0,0,0,5}, global_sid_Builtin_Backup_Operators_subauths }; +static uint32_t global_sid_Builtin_Replicator_subauths[] = {32,552,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Builtin_Replicator = /* Builtin replicator */ -{ 1, 2, {0,0,0,0,0,5}, {32,552,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 2, {0,0,0,0,0,5}, global_sid_Builtin_Replicator_subauths }; +static uint32_t global_sid_Builtin_PreWin2kAccess_subauths[] = {32,554,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Builtin_PreWin2kAccess = /* Builtin pre win2k access */ -{ 1, 2, {0,0,0,0,0,5}, {32,554,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 2, {0,0,0,0,0,5}, global_sid_Builtin_PreWin2kAccess_subauths }; +static uint32_t global_sid_Unix_Users_subauths[] = {1,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Unix_Users = /* Unmapped Unix users */ -{ 1, 1, {0,0,0,0,0,22}, {1,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 1, {0,0,0,0,0,22}, global_sid_Unix_Users_subauths }; +static uint32_t global_sid_Unix_Groups_subauths[] = {2,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; const DOM_SID global_sid_Unix_Groups = /* Unmapped Unix groups */ -{ 1, 1, {0,0,0,0,0,22}, {2,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; +{ 1, 1, {0,0,0,0,0,22}, global_sid_Unix_Groups_subauths }; /* Unused, left here for documentary purposes */ #if 0 @@ -96,13 +120,13 @@ */ static DOM_SID anon_sid_array[3] = -{ { 1, 1, {0,0,0,0,0,1}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}, - { 1, 1, {0,0,0,0,0,5}, {2,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}, - { 1, 1, {0,0,0,0,0,5}, {7,0,0,0,0,0,0,0,0,0,0,0,0,0,0}} }; +{ { 1, 1, {0,0,0,0,0,1}, global_sid_World_subauths}, + { 1, 1, {0,0,0,0,0,5}, global_sid_Network_subauths}, + { 1, 1, {0,0,0,0,0,5}, global_sid_Anonymous_subauths} }; NT_USER_TOKEN anonymous_token = { 3, anon_sid_array, SE_NONE }; static DOM_SID system_sid_array[1] = -{ { 1, 1, {0,0,0,0,0,5}, {18,0,0,0,0,0,0,0,0,0,0,0,0,0,0}} }; +{ { 1, 1, {0,0,0,0,0,5}, global_sid_System_subauths} }; NT_USER_TOKEN system_token = { 1, system_sid_array, SE_ALL_PRIVS }; /****************************************************************************