Patch from Kevin Stefanik <kstef@mtppi.org> to do some more error checking for

group mapping init failures.
(This used to be commit cd6a2dad4e3092a19f784b6548fce49ecd8bb549)

diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index f71a184bb87d787a8cfaf3a06aa782c18c6fc38c..a25566a6a86e1b0a5b90e1e108de158f2c18aad9 100644 (file)
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -199,7 +199,10 @@ BOOL add_mapping_entry(GROUP_MAP *map, int flag)
        int i;
        PRIVILEGE_SET *set;
 
-       init_group_mapping();
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
        
        sid_to_string(string_sid, &map->sid);
 
@@ -509,7 +512,10 @@ BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map, BOOL with_priv)
        int i;
        PRIVILEGE_SET *set;
        
-       init_group_mapping();
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
 
        /* the key is the SID, retrieving is direct */
 
@@ -568,7 +574,10 @@ BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map, BOOL with_priv)
        int i;
        PRIVILEGE_SET *set;
 
-       init_group_mapping();
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
 
        /* we need to enumerate the TDB to find the GID */
 
@@ -628,7 +637,10 @@ BOOL get_group_map_from_ntname(char *name, GROUP_MAP *map, BOOL with_priv)
        int i;
        PRIVILEGE_SET *set;
 
-       init_group_mapping();
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
 
        /* we need to enumerate the TDB to find the name */
 
@@ -688,7 +700,10 @@ BOOL group_map_remove(DOM_SID sid)
        pstring key;
        fstring string_sid;
        
-       init_group_mapping();
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
 
        /* the key is the SID, retrieving is direct */
 
@@ -726,7 +741,10 @@ BOOL enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap,
        int i;
        PRIVILEGE_SET *set;
 
-       init_group_mapping();
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
 
        *num_entries=0;
        *rmap=NULL;