init wellknown in pdbedit too

add group mapping mappings to idmap at startup
(This used to be commit 62365023db61d5a4fa32845af3db73bce6cb94ea)

diff --git a/source3/sam/idmap_util.c b/source3/sam/idmap_util.c
index 92cbb103db3f3c7f101daa6e8f9b65d237bcb5f7..1508523ea6fb2050f83b076ffec279f26a9601b0 100644 (file)
--- a/source3/sam/idmap_util.c
+++ b/source3/sam/idmap_util.c
@@ -172,12 +172,8 @@ NTSTATUS gid_to_sid(DOM_SID *sid, gid_t gid)
        if (NT_STATUS_IS_ERR(ret = idmap_get_sid_from_id(sid, id, flags))) {
                DEBUG(10, ("gid_to_sid: Failed to map sid = [%s]\n", sid_string_static(sid)));
                if (flags & ID_NOMAP) {
-                       if (pdb_getgrgid(&map, gid, MAPPING_WITHOUT_PRIV)) {
-                               sid_copy(sid, &map.sid);
-                       } else {
-                               sid_copy(sid, get_global_sam_sid());
-                               sid_append_rid(sid, pdb_gid_to_group_rid(gid));
-                       }
+                       sid_copy(sid, get_global_sam_sid());
+                       sid_append_rid(sid, pdb_gid_to_group_rid(gid));
 
                        DEBUG(10,("gid_to_sid: Fall back to algorithmic mapping: %u -> %s\n", (unsigned int)gid, sid_string_static(sid)));
                        ret = NT_STATUS_OK;
@@ -274,25 +270,13 @@ NTSTATUS sid_to_gid(const DOM_SID *sid, gid_t *gid)
 
                DEBUG(10,("sid_to_gid: Fall back to algorithmic mapping\n"));
 
-               /* the group mapping code should register mappings in idmap
-                * and have the following if() eliminated */
-               if (pdb_getgrsid(&map, *sid, MAPPING_WITHOUT_PRIV)) {
-                       /* the SID is in the mapping table but not mapped */
-                       if (map.gid==(gid_t)-1) {
-                               ret = NT_STATUS_UNSUCCESSFUL;
-                       } else {
-                               *gid = map.gid;
-                               ret = NT_STATUS_OK;
-                       }
+               if (fallback_pdb_rid_is_user(rid)) {
+                       DEBUG(3, ("sid_to_gid: SID %s is *NOT* a group\n", sid_string_static(sid)));
+                       ret = NT_STATUS_UNSUCCESSFUL;
                } else {
-                       if (fallback_pdb_rid_is_user(rid)) {
-                               DEBUG(3, ("sid_to_gid: SID %s is *NOT* a group\n", sid_string_static(sid)));
-                               ret = NT_STATUS_UNSUCCESSFUL;
-                       } else {
-                               *gid = pdb_group_rid_to_gid(rid);
-                               DEBUG(10,("sid_to_gid: mapping: %s -> %u\n", sid_string_static(sid), (unsigned int)(*gid)));
-                               ret = NT_STATUS_OK;
-                       }
+                       *gid = pdb_group_rid_to_gid(rid);
+                       DEBUG(10,("sid_to_gid: mapping: %s -> %u\n", sid_string_static(sid), (unsigned int)(*gid)));
+                       ret = NT_STATUS_OK;
                }
        }
 
@@ -305,6 +289,8 @@ BOOL idmap_init_wellknown_sids(void)
 {
        const char *guest_account = lp_guestaccount();
        struct passwd *pass;
+       GROUP_MAP *map=NULL;
+       int num_entries=0;
        DOM_SID sid;
        unid_t id;
        int flags;
@@ -328,6 +314,16 @@ BOOL idmap_init_wellknown_sids(void)
                return False;
        }
 
+       /* now fill in group mappings */
+       if(pdb_enum_group_mapping(SID_NAME_UNKNOWN, &map, &num_entries, ENUM_ONLY_MAPPED, MAPPING_WITHOUT_PRIV)) {
+               int i;
+
+               for (i = 0; i < num_entries; i++) {
+                       id.gid = map[i].gid;
+                       idmap_set_mapping(&(map[i].sid), id, ID_GROUPID);
+               }
+       }
+
        /* check if DOMAIN_GROUP_RID_GUESTS SID is set, if not store the
         * guest account gid as mapping */
        flags = ID_GROUPID | ID_NOMAP;

diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 4cb3db52b7f4a0be56089992a4e0e0ac9262f2f6..13f35e888068c5a67381f65ac62ad50ff972b403 100644 (file)
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -610,6 +610,12 @@ int main (int argc, char **argv)
        if (!init_names())
                exit(1);
 
+       if (!idmap_init())
+               exit(1);
+
+       if (!idmap_init_wellknown_sids())
+               exit(1);
+
        setparms =      (backend ? BIT_BACKEND : 0) +
                        (verbose ? BIT_VERBOSE : 0) +
                        (spstyle ? BIT_SPSTYLE : 0) +