git.samba.org / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
s3-group-mapping: Remove fstrings from GROUP_MAP.
[samba.git] / source3 / libnet / libnet_samsync_passdb.c
diff --git a/source3/libnet/libnet_samsync_passdb.c b/source3/libnet/libnet_samsync_passdb.c
index 0cf2ed3323d995161f98b6994b4ccca9beb47213..cf479344754d68db8dd2bf7717c6e64d47da9eea 100644 (file)
--- a/source3/libnet/libnet_samsync_passdb.c
+++ b/source3/libnet/libnet_samsync_passdb.c
@@ -301,7 +301,7 @@ static NTSTATUS fetch_account_info(TALLOC_CTX *mem_ctx,
        NTSTATUS nt_ret = NT_STATUS_UNSUCCESSFUL;
        fstring account;
        struct samu *sam_account=NULL;
-       GROUP_MAP map;
+       GROUP_MAP *map = NULL;
        struct group *grp;
        struct dom_sid user_sid;
        struct dom_sid group_sid;
@@ -355,14 +355,19 @@ static NTSTATUS fetch_account_info(TALLOC_CTX *mem_ctx,
 
        group_sid = *pdb_get_group_sid(sam_account);
 
-       if (!pdb_getgrsid(&map, group_sid)) {
+       map = talloc_zero(mem_ctx, GROUP_MAP);
+       if (!map) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (!pdb_getgrsid(map, group_sid)) {
                DEBUG(0, ("Primary group of %s has no mapping!\n",
                          pdb_get_username(sam_account)));
        } else {
-               if (map.gid != passwd->pw_gid) {
-                       if (!(grp = getgrgid(map.gid))) {
+               if (map->gid != passwd->pw_gid) {
+                       if (!(grp = getgrgid(map->gid))) {
                                DEBUG(0, ("Could not find unix group %lu for user %s (group SID=%s)\n",
-                                         (unsigned long)map.gid, pdb_get_username(sam_account), sid_string_tos(&group_sid)));
+                                         (unsigned long)map->gid, pdb_get_username(sam_account), sid_string_tos(&group_sid)));
                        } else {
                                smb_set_primary_group(grp->gr_name, pdb_get_username(sam_account));
                        }
@@ -376,6 +381,7 @@ static NTSTATUS fetch_account_info(TALLOC_CTX *mem_ctx,
 
  done:
        TALLOC_FREE(sam_account);
+       TALLOC_FREE(map);
        return nt_ret;
 }
 
@@ -386,60 +392,65 @@ static NTSTATUS fetch_group_info(TALLOC_CTX *mem_ctx,
                                 uint32_t rid,
                                 struct netr_DELTA_GROUP *r)
 {
-       fstring name;
-       fstring comment;
        struct group *grp = NULL;
        struct dom_sid group_sid;
        fstring sid_string;
-       GROUP_MAP map;
+       GROUP_MAP *map;
        bool insert = true;
 
-       fstrcpy(name, r->group_name.string);
-       fstrcpy(comment, r->description.string);
-
+       map = talloc_zero(mem_ctx, GROUP_MAP);
+       if (!map) {
+               return NT_STATUS_NO_MEMORY;
+       }
        /* add the group to the mapping table */
        sid_compose(&group_sid, get_global_sam_sid(), rid);
        sid_to_fstring(sid_string, &group_sid);
 
-       if (pdb_getgrsid(&map, group_sid)) {
-               if ( map.gid != -1 )
-                       grp = getgrgid(map.gid);
+       if (pdb_getgrsid(map, group_sid)) {
+               if (map->gid != -1) {
+                       grp = getgrgid(map->gid);
+               }
                insert = false;
        }
 
+       map->nt_name = talloc_strdup(map, r->group_name.string);
+       if (!map->nt_name) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       map->comment = talloc_strdup(map, r->description.string);
+       if (!map->comment) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
        if (grp == NULL) {
                gid_t gid;
 
                /* No group found from mapping, find it from its name. */
-               if ((grp = getgrnam(name)) == NULL) {
+               if ((grp = getgrnam(map->nt_name)) == NULL) {
 
                        /* No appropriate group found, create one */
 
-                       d_printf("Creating unix group: '%s'\n", name);
+                       d_printf("Creating unix group: '%s'\n", map->nt_name);
 
-                       if (smb_create_group(name, &gid) != 0)
+                       if (smb_create_group(map->nt_name, &gid) != 0)
                                return NT_STATUS_ACCESS_DENIED;
 
-                       if ((grp = getgrnam(name)) == NULL)
+                       if ((grp = getgrnam(map->nt_name)) == NULL)
                                return NT_STATUS_ACCESS_DENIED;
                }
        }
 
-       map.gid = grp->gr_gid;
-       map.sid = group_sid;
-       map.sid_name_use = SID_NAME_DOM_GRP;
-       strlcpy(map.nt_name, name, sizeof(map.nt_name));
-       if (r->description.string) {
-               strlcpy(map.comment, comment, sizeof(map.comment));
+       map->gid = grp->gr_gid;
+       map->sid = group_sid;
+       map->sid_name_use = SID_NAME_DOM_GRP;
+
+       if (insert) {
+               pdb_add_group_mapping_entry(map);
        } else {
-               strlcpy(map.comment, "", sizeof(map.comment));
+               pdb_update_group_mapping_entry(map);
        }
 
-       if (insert)
-               pdb_add_group_mapping_entry(&map);
-       else
-               pdb_update_group_mapping_entry(&map);
-
+       TALLOC_FREE(map);
        return NT_STATUS_OK;
 }
 
@@ -454,7 +465,7 @@ static NTSTATUS fetch_group_mem_info(TALLOC_CTX *mem_ctx,
        char **nt_members = NULL;
        char **unix_members;
        struct dom_sid group_sid;
-       GROUP_MAP map;
+       GROUP_MAP *map;
        struct group *grp;
 
        if (r->num_rids == 0) {
@@ -463,16 +474,26 @@ static NTSTATUS fetch_group_mem_info(TALLOC_CTX *mem_ctx,
 
        sid_compose(&group_sid, get_global_sam_sid(), rid);
 
-       if (!get_domain_group_from_sid(group_sid, &map)) {
+       map = talloc_zero(mem_ctx, GROUP_MAP);
+       if (!map) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (!get_domain_group_from_sid(group_sid, map)) {
                DEBUG(0, ("Could not find global group %d\n", rid));
+               TALLOC_FREE(map);
                return NT_STATUS_NO_SUCH_GROUP;
        }
 
-       if (!(grp = getgrgid(map.gid))) {
-               DEBUG(0, ("Could not find unix group %lu\n", (unsigned long)map.gid));
+       if (!(grp = getgrgid(map->gid))) {
+               DEBUG(0, ("Could not find unix group %lu\n",
+                                               (unsigned long)map->gid));
+               TALLOC_FREE(map);
                return NT_STATUS_NO_SUCH_GROUP;
        }
 
+       TALLOC_FREE(map);
+
        d_printf("Group members of %s: ", grp->gr_name);
 
        if (r->num_rids) {
@@ -575,56 +596,65 @@ static NTSTATUS fetch_alias_info(TALLOC_CTX *mem_ctx,
                                 struct netr_DELTA_ALIAS *r,
                                 const struct dom_sid *dom_sid)
 {
-       fstring name;
-       fstring comment;
        struct group *grp = NULL;
        struct dom_sid alias_sid;
        fstring sid_string;
-       GROUP_MAP map;
+       GROUP_MAP *map;
        bool insert = true;
 
-       fstrcpy(name, r->alias_name.string);
-       fstrcpy(comment, r->description.string);
+       map = talloc_zero(mem_ctx, GROUP_MAP);
+       if (!map) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
        /* Find out whether the group is already mapped */
        sid_compose(&alias_sid, dom_sid, rid);
        sid_to_fstring(sid_string, &alias_sid);
 
-       if (pdb_getgrsid(&map, alias_sid)) {
-               grp = getgrgid(map.gid);
+       if (pdb_getgrsid(map, alias_sid)) {
+               grp = getgrgid(map->gid);
                insert = false;
        }
 
+       map->nt_name = talloc_strdup(map, r->alias_name.string);
+       if (!map->nt_name) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       map->comment = talloc_strdup(map, r->description.string);
+       if (!map->comment) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
        if (grp == NULL) {
                gid_t gid;
 
                /* No group found from mapping, find it from its name. */
-               if ((grp = getgrnam(name)) == NULL) {
+               if ((grp = getgrnam(map->nt_name)) == NULL) {
                        /* No appropriate group found, create one */
-                       d_printf("Creating unix group: '%s'\n", name);
-                       if (smb_create_group(name, &gid) != 0)
+                       d_printf("Creating unix group: '%s'\n", map->nt_name);
+                       if (smb_create_group(map->nt_name, &gid) != 0)
                                return NT_STATUS_ACCESS_DENIED;
                        if ((grp = getgrgid(gid)) == NULL)
                                return NT_STATUS_ACCESS_DENIED;
                }
        }
 
-       map.gid = grp->gr_gid;
-       map.sid = alias_sid;
+       map->gid = grp->gr_gid;
+       map->sid = alias_sid;
 
-       if (dom_sid_equal(dom_sid, &global_sid_Builtin))
-               map.sid_name_use = SID_NAME_WKN_GRP;
-       else
-               map.sid_name_use = SID_NAME_ALIAS;
-
-       strlcpy(map.nt_name, name, sizeof(map.nt_name));
-       strlcpy(map.comment, comment, sizeof(map.comment));
+       if (dom_sid_equal(dom_sid, &global_sid_Builtin)) {
+               map->sid_name_use = SID_NAME_WKN_GRP;
+       } else {
+               map->sid_name_use = SID_NAME_ALIAS;
+       }
 
-       if (insert)
-               pdb_add_group_mapping_entry(&map);
-       else
-               pdb_update_group_mapping_entry(&map);
+       if (insert) {
+               pdb_add_group_mapping_entry(map);
+       } else {
+               pdb_update_group_mapping_entry(map);
+       }
 
+       TALLOC_FREE(map);
        return NT_STATUS_OK;
 }
 
Samba Shared Repository