Author: vlendec Date: 2005-12-11 21:59:58 +0000 (Sun, 11 Dec 2005) New Revision: 12185
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12185 Log: Cosmetic cleanup Modified: branches/SAMBA_3_0/source/groupdb/mapping.c branches/SAMBA_3_0/source/utils/net_groupmap.c trunk/source/groupdb/mapping.c trunk/source/utils/net_groupmap.c Changeset: Modified: branches/SAMBA_3_0/source/groupdb/mapping.c =================================================================== --- branches/SAMBA_3_0/source/groupdb/mapping.c 2005-12-11 18:34:07 UTC (rev 12184) +++ branches/SAMBA_3_0/source/groupdb/mapping.c 2005-12-11 21:59:58 UTC (rev 12185) @@ -35,37 +35,7 @@ */ #define MEMBEROF_PREFIX "MEMBEROF/" -static struct sid_name_mapping { - enum SID_NAME_USE type; - const char *name; -} sid_name_use_strings[] = { - { SID_NAME_USE_NONE, "Not initialized" }, - { SID_NAME_USER, "User" }, - { SID_NAME_DOM_GRP, "Domain group" }, - { SID_NAME_DOMAIN, "Domain" }, - { SID_NAME_ALIAS, "Local group" }, - { SID_NAME_WKN_GRP, "Builtin group" }, - { SID_NAME_DELETED, "Deleted" }, - { SID_NAME_INVALID, "Invalid" }, - { 0, NULL } -}; - /**************************************************************************** -dump the mapping group mapping to a text file -****************************************************************************/ -const char *decode_sid_name_use(enum SID_NAME_USE name_use) -{ - struct sid_name_mapping *m; - - for (m = sid_name_use_strings; m->name != NULL; m++) { - if (m->type == name_use) - return m->name; - } - - return "Unknown type"; -} - -/**************************************************************************** initialise first time the mapping list - called from init_group_mapping() ****************************************************************************/ static BOOL default_group_mapping(void) @@ -445,8 +415,9 @@ string_to_sid(&map.sid, string_sid); - DEBUG(11,("enum_group_mapping: returning group %s of type %s\n", - map.nt_name, decode_sid_name_use(map.sid_name_use))); + DEBUG(11,("enum_group_mapping: returning group %s of " + "type %s\n", map.nt_name, + sid_type_lookup(map.sid_name_use))); mapt= SMB_REALLOC_ARRAY((*pp_rmap), GROUP_MAP, entries+1); if (!mapt) { Modified: branches/SAMBA_3_0/source/utils/net_groupmap.c =================================================================== --- branches/SAMBA_3_0/source/utils/net_groupmap.c 2005-12-11 18:34:07 UTC (rev 12184) +++ branches/SAMBA_3_0/source/utils/net_groupmap.c 2005-12-11 21:59:58 UTC (rev 12185) @@ -95,7 +95,7 @@ d_printf("\tSID : %s\n", sid_string_static(&map.sid)); d_printf("\tUnix group: %s\n", gidtoname(map.gid)); d_printf("\tGroup type: %s\n", - decode_sid_name_use(map.sid_name_use)); + sid_type_lookup(map.sid_name_use)); d_printf("\tComment : %s\n", map.comment); } Modified: trunk/source/groupdb/mapping.c =================================================================== --- trunk/source/groupdb/mapping.c 2005-12-11 18:34:07 UTC (rev 12184) +++ trunk/source/groupdb/mapping.c 2005-12-11 21:59:58 UTC (rev 12185) @@ -35,37 +35,7 @@ */ #define MEMBEROF_PREFIX "MEMBEROF/" -static struct sid_name_mapping { - enum SID_NAME_USE type; - const char *name; -} sid_name_use_strings[] = { - { SID_NAME_USE_NONE, "Not initialized" }, - { SID_NAME_USER, "User" }, - { SID_NAME_DOM_GRP, "Domain group" }, - { SID_NAME_DOMAIN, "Domain" }, - { SID_NAME_ALIAS, "Local group" }, - { SID_NAME_WKN_GRP, "Builtin group" }, - { SID_NAME_DELETED, "Deleted" }, - { SID_NAME_INVALID, "Invalid" }, - { 0, NULL } -}; - /**************************************************************************** -dump the mapping group mapping to a text file -****************************************************************************/ -const char *decode_sid_name_use(enum SID_NAME_USE name_use) -{ - struct sid_name_mapping *m; - - for (m = sid_name_use_strings; m->name != NULL; m++) { - if (m->type == name_use) - return m->name; - } - - return "Unknown type"; -} - -/**************************************************************************** initialise first time the mapping list - called from init_group_mapping() ****************************************************************************/ static BOOL default_group_mapping(void) @@ -445,8 +415,9 @@ string_to_sid(&map.sid, string_sid); - DEBUG(11,("enum_group_mapping: returning group %s of type %s\n", - map.nt_name, decode_sid_name_use(map.sid_name_use))); + DEBUG(11,("enum_group_mapping: returning group %s of " + "type %s\n", map.nt_name, + sid_type_lookup(map.sid_name_use))); mapt= SMB_REALLOC_ARRAY((*pp_rmap), GROUP_MAP, entries+1); if (!mapt) { Modified: trunk/source/utils/net_groupmap.c =================================================================== --- trunk/source/utils/net_groupmap.c 2005-12-11 18:34:07 UTC (rev 12184) +++ trunk/source/utils/net_groupmap.c 2005-12-11 21:59:58 UTC (rev 12185) @@ -95,7 +95,7 @@ d_printf("\tSID : %s\n", sid_string_static(&map.sid)); d_printf("\tUnix group: %s\n", gidtoname(map.gid)); d_printf("\tGroup type: %s\n", - decode_sid_name_use(map.sid_name_use)); + sid_type_lookup(map.sid_name_use)); d_printf("\tComment : %s\n", map.comment); }
