s3-group-mapping: Remove fstrings from GROUP_MAP.

Signed-off-by: Andreas Schneider <asn@samba.org>

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Oct 12 19:28:12 CEST 2011 on sn-devel-104

3 files changed, 191 insertions, 116 deletions

diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 09f4bfd33a..f6802f2644 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -33,24 +33,32 @@
 **********************************************************/
 static bool get_sid_from_input(struct dom_sid *sid, char *input)
 {
-	GROUP_MAP map;
+	GROUP_MAP *map;
+
+	map = talloc_zero(NULL, GROUP_MAP);
+	if (!map) {
+		return false;
+	}
 
 	if (strncasecmp_m( input, "S-", 2)) {
 		/* Perhaps its the NT group name? */
-		if (!pdb_getgrnam(&map, input)) {
+		if (!pdb_getgrnam(map, input)) {
 			printf(_("NT Group %s doesn't exist in mapping DB\n"),
 			       input);
+			TALLOC_FREE(map);
 			return false;
 		} else {
-			*sid = map.sid;
+			*sid = map->sid;
 		}
 	} else {
 		if (!string_to_sid(sid, input)) {
 			printf(_("converting sid %s from a string failed!\n"),
 			       input);
+			TALLOC_FREE(map);
 			return false;
 		}
 	}
+	TALLOC_FREE(map);
 	return true;
 }
 
@@ -127,7 +135,7 @@ static int net_groupmap_list(struct net_context *c, int argc, const char **argv)
 	/* list a single group is given a name */
 	if ( ntgroup[0] || sid_string[0] ) {
 		struct dom_sid sid;
-		GROUP_MAP map;
+		GROUP_MAP *map;
 
 		if ( sid_string[0] )
 			strlcpy(ntgroup, sid_string, sizeof(ntgroup));
@@ -136,27 +144,39 @@ static int net_groupmap_list(struct net_context *c, int argc, const char **argv)
 			return -1;
 		}
 
+		map = talloc_zero(NULL, GROUP_MAP);
+		if (!map) {
+			return -1;
+		}
+
 		/* Get the current mapping from the database */
-		if(!pdb_getgrsid(&map, sid)) {
+		if(!pdb_getgrsid(map, sid)) {
 			d_fprintf(stderr,
 				  _("Failure to local group SID in the "
 				    "database\n"));
+			TALLOC_FREE(map);
 			return -1;
 		}
 
-		print_map_entry(&map, long_list );
+		print_map_entry(map, long_list );
+		TALLOC_FREE(map);
 	}
 	else {
-		GROUP_MAP *map=NULL;
+		GROUP_MAP **maps = NULL;
+		bool ok = false;
 		/* enumerate all group mappings */
-		if (!pdb_enum_group_mapping(NULL, SID_NAME_UNKNOWN, &map, &entries, ENUM_ALL_MAPPED))
+		ok = pdb_enum_group_mapping(NULL, SID_NAME_UNKNOWN,
+					    &maps, &entries,
+					    ENUM_ALL_MAPPED);
+		if (!ok) {
 			return -1;
+		}
 
 		for (i=0; i<entries; i++) {
-			print_map_entry(&map[i], long_list);
+			print_map_entry(maps[i], long_list);
 		}
 
-		SAFE_FREE(map);
+		TALLOC_FREE(maps);
 	}
 
 	return 0;
@@ -178,7 +198,7 @@ static int net_groupmap_add(struct net_context *c, int argc, const char **argv)
 	uint32 rid = 0;
 	gid_t gid;
 	int i;
-	GROUP_MAP map;
+	GROUP_MAP *map;
 
 	const char *name_type;
 	const char add_usage_str[] = N_("net groupmap add "
@@ -188,10 +208,6 @@ static int net_groupmap_add(struct net_context *c, int argc, const char **argv)
 					"[ntgroup=<string>] "
 					"[comment=<string>]");
 
-	ZERO_STRUCT(map);
-
-	/* Default is domain group. */
-	map.sid_name_use = SID_NAME_DOM_GRP;
 	name_type = "domain group";
 
 	if (c->display_usage) {
@@ -280,13 +296,19 @@ static int net_groupmap_add(struct net_context *c, int argc, const char **argv)
 		return -1;
 	}
 
-	{
-		if (pdb_getgrgid(&map, gid)) {
-			d_printf(_("Unix group %s already mapped to SID %s\n"),
-				 unixgrp, sid_string_tos(&map.sid));
-			return -1;
-		}
+	map = talloc_zero(NULL, GROUP_MAP);
+	if (!map) {
+		return -1;
 	}
+	/* Default is domain group. */
+	map->sid_name_use = SID_NAME_DOM_GRP;
+	if (pdb_getgrgid(map, gid)) {
+		d_printf(_("Unix group %s already mapped to SID %s\n"),
+			 unixgrp, sid_string_tos(&map->sid));
+		TALLOC_FREE(map);
+		return -1;
+	}
+	TALLOC_FREE(map);
 
 	if ( (rid == 0) && (string_sid[0] == '\0') ) {
 		d_printf(_("No rid or sid specified, choosing a RID\n"));
@@ -339,7 +361,7 @@ static int net_groupmap_add(struct net_context *c, int argc, const char **argv)
 static int net_groupmap_modify(struct net_context *c, int argc, const char **argv)
 {
 	struct dom_sid sid;
-	GROUP_MAP map;
+	GROUP_MAP *map = NULL;
 	fstring ntcomment = "";
 	fstring type = "";
 	fstring ntgroup = "";
@@ -430,10 +452,16 @@ static int net_groupmap_modify(struct net_context *c, int argc, const char **arg
 		}
 	}
 
+	map = talloc_zero(NULL, GROUP_MAP);
+	if (!map) {
+		return -1;
+	}
+
 	/* Get the current mapping from the database */
-	if(!pdb_getgrsid(&map, sid)) {
+	if(!pdb_getgrsid(map, sid)) {
 		d_fprintf(stderr,
 			 _("Failed to find local group SID in the database\n"));
+		TALLOC_FREE(map);
 		return -1;
 	}
 
@@ -443,24 +471,36 @@ static int net_groupmap_modify(struct net_context *c, int argc, const char **arg
 	 */
 	if (sid_type == SID_NAME_UNKNOWN) {
 		d_fprintf(stderr, _("Can't map to an unknown group type.\n"));
+		TALLOC_FREE(map);
 		return -1;
         }
 
-	if (map.sid_name_use == SID_NAME_WKN_GRP) {
+	if (map->sid_name_use == SID_NAME_WKN_GRP) {
 		d_fprintf(stderr,
 			  _("You can only change between domain and local "
 			    "groups.\n"));
+		TALLOC_FREE(map);
 		return -1;
 	}
 
-	map.sid_name_use=sid_type;
+	map->sid_name_use = sid_type;
 
 	/* Change comment if new one */
-	if ( ntcomment[0] )
-		strlcpy(map.comment, ntcomment, sizeof(map.comment));
+	if (ntcomment[0]) {
+		map->comment = talloc_strdup(map, ntcomment);
+		if (!map->comment) {
+			d_fprintf(stderr, _("Out of memory!\n"));
+			return -1;
+		}
+	}
 
-	if ( ntgroup[0] )
-		strlcpy(map.nt_name, ntgroup, sizeof(map.nt_name));
+	if (ntgroup[0]) {
+		map->nt_name = talloc_strdup(map, ntgroup);
+		if (!map->nt_name) {
+			d_fprintf(stderr, _("Out of memory!\n"));
+			return -1;
+		}
+	}
 
 	if ( unixgrp[0] ) {
 		gid = nametogid( unixgrp );
@@ -468,19 +508,22 @@ static int net_groupmap_modify(struct net_context *c, int argc, const char **arg
 			d_fprintf(stderr, _("Unable to lookup UNIX group %s.  "
 					    "Make sure the group exists.\n"),
 				unixgrp);
+			TALLOC_FREE(map);
 			return -1;
 		}
 
-		map.gid = gid;
+		map->gid = gid;
 	}
 
-	if ( !NT_STATUS_IS_OK(pdb_update_group_mapping_entry(&map)) ) {
+	if (!NT_STATUS_IS_OK(pdb_update_group_mapping_entry(map))) {
 		d_fprintf(stderr, _("Could not update group database\n"));
+		TALLOC_FREE(map);
 		return -1;
 	}
 
-	d_printf(_("Updated mapping entry for %s\n"), map.nt_name);
+	d_printf(_("Updated mapping entry for %s\n"), map->nt_name);
 
+	TALLOC_FREE(map);
 	return 0;
 }
 
@@ -552,7 +595,7 @@ static int net_groupmap_set(struct net_context *c, int argc, const char **argv)
 {
 	const char *ntgroup = NULL;
 	struct group *grp = NULL;
-	GROUP_MAP map;
+	GROUP_MAP *map;
 	bool have_map = false;
 
 	if ((argc < 1) || (argc > 2) || c->display_usage) {
@@ -580,13 +623,19 @@ static int net_groupmap_set(struct net_context *c, int argc, const char **argv)
 		}
 	}
 
-	have_map = pdb_getgrnam(&map, ntgroup);
+	map = talloc_zero(NULL, GROUP_MAP);
+	if (!map) {
+		d_printf(_("Out of memory!\n"));
+		return -1;
+	}
+
+	have_map = pdb_getgrnam(map, ntgroup);
 
 	if (!have_map) {
 		struct dom_sid sid;
 		have_map = ( (strncmp(ntgroup, "S-", 2) == 0) &&
 			     string_to_sid(&sid, ntgroup) &&
-			     pdb_getgrsid(&map, sid) );
+			     pdb_getgrsid(map, sid) );
 	}
 
 	if (!have_map) {
@@ -597,33 +646,41 @@ static int net_groupmap_set(struct net_context *c, int argc, const char **argv)
 			d_fprintf(stderr,
 				  _("Could not find group mapping for %s\n"),
 				  ntgroup);
+			TALLOC_FREE(map);
 			return -1;
 		}
 
-		map.gid = grp->gr_gid;
+		map->gid = grp->gr_gid;
 
 		if (c->opt_rid == 0) {
 			if ( pdb_capabilities() & PDB_CAP_STORE_RIDS ) {
 				if ( !pdb_new_rid((uint32*)&c->opt_rid) ) {
 					d_fprintf( stderr,
 					    _("Could not allocate new RID\n"));
+					TALLOC_FREE(map);
 					return -1;
 				}
 			} else {
-				c->opt_rid = algorithmic_pdb_gid_to_group_rid(map.gid);
+				c->opt_rid = algorithmic_pdb_gid_to_group_rid(map->gid);
 			}
 		}
 
-		sid_compose(&map.sid, get_global_sam_sid(), c->opt_rid);
+		sid_compose(&map->sid, get_global_sam_sid(), c->opt_rid);
 
-		map.sid_name_use = SID_NAME_DOM_GRP;
-		fstrcpy(map.nt_name, ntgroup);
-		fstrcpy(map.comment, "");
+		map->sid_name_use = SID_NAME_DOM_GRP;
+		map->nt_name = talloc_strdup(map, ntgroup);
+		map->comment = talloc_strdup(map, "");
+		if (!map->nt_name || !map->comment) {
+			d_printf(_("Out of memory!\n"));
+			TALLOC_FREE(map);
+			return -1;
+		}
 
-		if (!NT_STATUS_IS_OK(pdb_add_group_mapping_entry(&map))) {
+		if (!NT_STATUS_IS_OK(pdb_add_group_mapping_entry(map))) {
 			d_fprintf(stderr,
 				  _("Could not add mapping entry for %s\n"),
 				  ntgroup);
+			TALLOC_FREE(map);
 			return -1;
 		}
 	}
@@ -631,46 +688,59 @@ static int net_groupmap_set(struct net_context *c, int argc, const char **argv)
 	/* Now we have a mapping entry, update that stuff */
 
 	if ( c->opt_localgroup || c->opt_domaingroup ) {
-		if (map.sid_name_use == SID_NAME_WKN_GRP) {
+		if (map->sid_name_use == SID_NAME_WKN_GRP) {
 			d_fprintf(stderr,
 				  _("Can't change type of the BUILTIN "
 				    "group %s\n"),
-				  map.nt_name);
+				  map->nt_name);
+			TALLOC_FREE(map);
 			return -1;
 		}
 	}
 
 	if (c->opt_localgroup)
-		map.sid_name_use = SID_NAME_ALIAS;
+		map->sid_name_use = SID_NAME_ALIAS;
 
 	if (c->opt_domaingroup)
-		map.sid_name_use = SID_NAME_DOM_GRP;
+		map->sid_name_use = SID_NAME_DOM_GRP;
 
 	/* The case (opt_domaingroup && opt_localgroup) was tested for above */
 
 	if ((c->opt_comment != NULL) && (strlen(c->opt_comment) > 0)) {
-		fstrcpy(map.comment, c->opt_comment);
+		map->comment = talloc_strdup(map, c->opt_comment);
+		if (!map->comment) {
+			d_printf(_("Out of memory!\n"));
+			TALLOC_FREE(map);
+			return -1;
+		}
 	}
 
 	if ((c->opt_newntname != NULL) && (strlen(c->opt_newntname) > 0)) {
-		fstrcpy(map.nt_name, c->opt_newntname);
+		map->nt_name = talloc_strdup(map, c->opt_newntname);
+		if (!map->nt_name) {
+			d_printf(_("Out of memory!\n"));
+			TALLOC_FREE(map);
+			return -1;
+		}
 	}
 
 	if (grp != NULL)
-		map.gid = grp->gr_gid;
+		map->gid = grp->gr_gid;
 
-	if (!NT_STATUS_IS_OK(pdb_update_group_mapping_entry(&map))) {
+	if (!NT_STATUS_IS_OK(pdb_update_group_mapping_entry(map))) {
 		d_fprintf(stderr, _("Could not update group mapping for %s\n"),
 			  ntgroup);
+		TALLOC_FREE(map);
 		return -1;
 	}
 
+	TALLOC_FREE(map);
 	return 0;
 }
 
 static int net_groupmap_cleanup(struct net_context *c, int argc, const char **argv)
 {
-	GROUP_MAP *map = NULL;
+	GROUP_MAP **maps = NULL;
 	size_t i, entries;
 
 	if (c->display_usage) {
@@ -682,7 +752,7 @@ static int net_groupmap_cleanup(struct net_context *c, int argc, const char **ar
 		return 0;
 	}
 
-	if (!pdb_enum_group_mapping(NULL, SID_NAME_UNKNOWN, &map, &entries,
+	if (!pdb_enum_group_mapping(NULL, SID_NAME_UNKNOWN, &maps, &entries,
 				    ENUM_ALL_MAPPED)) {
 		d_fprintf(stderr, _("Could not list group mappings\n"));
 		return -1;
@@ -690,19 +760,19 @@ static int net_groupmap_cleanup(struct net_context *c, int argc, const char **ar
 
 	for (i=0; i<entries; i++) {
 
-		if (map[i].gid == -1)
-			printf(_("Group %s is not mapped\n"), map[i].nt_name);
+		if (maps[i]->gid == -1)
+			printf(_("Group %s is not mapped\n"),
+				maps[i]->nt_name);
 
-		if (!sid_check_is_in_our_domain(&map[i].sid)) {
+		if (!sid_check_is_in_our_domain(&maps[i]->sid)) {
 			printf(_("Deleting mapping for NT Group %s, sid %s\n"),
-			       map[i].nt_name,
-			       sid_string_tos(&map[i].sid));
-			pdb_delete_group_mapping_entry(map[i].sid);
+				maps[i]->nt_name,
+				sid_string_tos(&maps[i]->sid));
+			pdb_delete_group_mapping_entry(maps[i]->sid);
 		}
 	}
 
-	SAFE_FREE(map);
-
+	TALLOC_FREE(maps);
 	return 0;
 }
 
diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index 467e441f60..4ebd8a9e69 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -299,7 +299,7 @@ static int net_sam_set_pwdmustchangenow(struct net_context *c, int argc,
 static int net_sam_set_comment(struct net_context *c, int argc,
 			       const char **argv)
 {
-	GROUP_MAP map;
+	GROUP_MAP *map;
 	struct dom_sid sid;
 	enum lsa_SidType type;
 	const char *dom, *name;
@@ -330,14 +330,24 @@ static int net_sam_set_comment(struct net_context *c, int argc,
 		return -1;
 	}
 
-	if (!pdb_getgrsid(&map, sid)) {
+	map = talloc_zero(talloc_tos(), GROUP_MAP);
+	if (!map) {
+		d_fprintf(stderr, _("Out of memory!\n"));
+		return -1;
+	}
+
+	if (!pdb_getgrsid(map, sid)) {
 		d_fprintf(stderr, _("Could not load group %s\n"), argv[0]);
 		return -1;
 	}
 
-	fstrcpy(map.comment, argv[1]);
+	map->comment = talloc_strdup(map, argv[1]);
+	if (!map->comment) {
+		d_fprintf(stderr, _("Out of memory!\n"));
+		return -1;
+	}
 
-	status = pdb_update_group_mapping_entry(&map);
+	status = pdb_update_group_mapping_entry(map);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		d_fprintf(stderr, _("Updating group mapping entry failed with "
@@ -348,6 +358,7 @@ static int net_sam_set_comment(struct net_context *c, int argc,
 	d_printf("Updated comment of group %s\\%s to %s\n", dom, name,
 		 argv[1]);
 
+	TALLOC_FREE(map);
 	return 0;
 }
 
@@ -807,39 +818,33 @@ static int net_sam_rights(struct net_context *c, int argc, const char **argv)
  * Map a unix group to a domain group
  */
 
-static NTSTATUS map_unix_group(const struct group *grp, GROUP_MAP *pmap)
+static NTSTATUS map_unix_group(const struct group *grp, GROUP_MAP *map)
 {
-	NTSTATUS status;
-	GROUP_MAP map;
-	const char *grpname, *dom, *name;
+	const char *dom, *name;
 	uint32 rid;
 
-	if (pdb_getgrgid(&map, grp->gr_gid)) {
+	if (pdb_getgrgid(map, grp->gr_gid)) {
 		return NT_STATUS_GROUP_EXISTS;
 	}
 
-	map.gid = grp->gr_gid;
-	grpname = grp->gr_name;
+	map->gid = grp->gr_gid;
 
-	if (lookup_name(talloc_tos(), grpname, LOOKUP_NAME_LOCAL,
+	if (lookup_name(talloc_tos(), grp->gr_name, LOOKUP_NAME_LOCAL,
 			&dom, &name, NULL, NULL)) {
 
-		const char *tmp = talloc_asprintf(
-			talloc_tos(), "Unix Group %s", grp->gr_name);
+		map->nt_name = talloc_asprintf(map, "Unix Group %s",
+							grp->gr_name);
 
 		DEBUG(5, ("%s exists as %s\\%s, retrying as \"%s\"\n",
-			  grpname, dom, name, tmp));
-		grpname = tmp;
+			  grp->gr_name, dom, name, map->nt_name));
 	}
 
-	if (lookup_name(talloc_tos(), grpname, LOOKUP_NAME_LOCAL,
+	if (lookup_name(talloc_tos(), grp->gr_name, LOOKUP_NAME_LOCAL,
 			NULL, NULL, NULL, NULL)) {
 		DEBUG(3, ("\"%s\" exists, can't map it\n", grp->gr_name));
 		return NT_STATUS_GROUP_EXISTS;
 	}
 
-	fstrcpy(map.nt_name, grpname);
-
 	if (pdb_capabilities() & PDB_CAP_STORE_RIDS) {
 		if (!pdb_new_rid(&rid)) {
 			DEBUG(3, ("Could not get a new RID for %s\n",
@@ -850,22 +855,17 @@ static NTSTATUS map_unix_group(const struct group *grp, GROUP_MAP *pmap)
 		rid = algorithmic_pdb_gid_to_group_rid( grp->gr_gid );
 	}
 
-	sid_compose(&map.sid, get_global_sam_sid(), rid);
-	map.sid_name_use = SID_NAME_DOM_GRP;
-	fstrcpy(map.comment, talloc_asprintf(talloc_tos(), "Unix Group %s",
-					     grp->gr_name));
+	sid_compose(&map->sid, get_global_sam_sid(), rid);
+	map->sid_name_use = SID_NAME_DOM_GRP;
+	map->comment = talloc_asprintf(map, "Unix Group %s", grp->gr_name);
 
-	status = pdb_add_group_mapping_entry(&map);
-	if (NT_STATUS_IS_OK(status)) {
-		*pmap = map;
-	}
-	return status;
+	return pdb_add_group_mapping_entry(map);
 }
 
 static int net_sam_mapunixgroup(struct net_context *c, int argc, const char **argv)
 {
 	NTSTATUS status;
-	GROUP_MAP map;
+	GROUP_MAP *map;
 	struct group *grp;
 
 	if (argc != 1 || c->display_usage) {
@@ -881,7 +881,13 @@ static int net_sam_mapunixgroup(struct net_context *c, int argc, const char **ar
 		return -1;
 	}
 
-	status = map_unix_group(grp, &map);
+	map = talloc_zero(talloc_tos(), GROUP_MAP);
+	if (!map) {
+		d_fprintf(stderr, _("Out of memory!\n"));
+		return -1;
+	}
+
+	status = map_unix_group(grp, map);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		d_fprintf(stderr, _("Mapping group %s failed with %s\n"),
@@ -890,8 +896,9 @@ static int net_sam_mapunixgroup(struct net_context *c, int argc, const char **ar
 	}
 
 	d_printf(_("Mapped unix group %s to SID %s\n"), argv[0],
-		 sid_string_tos(&map.sid));
+		 sid_string_tos(&map->sid));
 
+	TALLOC_FREE(map);
 	return 0;
 }
 
@@ -899,24 +906,17 @@ static int net_sam_mapunixgroup(struct net_context *c, int argc, const char **ar
  * Remove a group mapping
  */
 
-static NTSTATUS unmap_unix_group(const struct group *grp, GROUP_MAP *pmap)
+static NTSTATUS unmap_unix_group(const struct group *grp)
 {
-        GROUP_MAP map;
-        const char *grpname;
         struct dom_sid dom_sid;
 
-        map.gid = grp->gr_gid;
-        grpname = grp->gr_name;
-
-        if (!lookup_name(talloc_tos(), grpname, LOOKUP_NAME_LOCAL,
+        if (!lookup_name(talloc_tos(), grp->gr_name, LOOKUP_NAME_LOCAL,
                         NULL, NULL, NULL, NULL)) {
                 DEBUG(3, ("\"%s\" does not exist, can't unmap it\n", grp->gr_name));
                 return NT_STATUS_NO_SUCH_GROUP;
         }
 
-        fstrcpy(map.nt_name, grpname);
-
-        if (!pdb_gid_to_sid(map.gid, &dom_sid)) {
+        if (!pdb_gid_to_sid(grp->gr_gid, &dom_sid)) {
                 return NT_STATUS_UNSUCCESSFUL;
         }
 
@@ -926,7 +926,6 @@ static NTSTATUS unmap_unix_group(const struct group *grp, GROUP_MAP *pmap)
 static int net_sam_unmapunixgroup(struct net_context *c, int argc, const char **argv)
 {
 	NTSTATUS status;
-	GROUP_MAP map;
 	struct group *grp;
 
 	if (argc != 1 || c->display_usage) {
@@ -943,7 +942,7 @@ static int net_sam_unmapunixgroup(struct net_context *c, int argc, const char **
 		return -1;
 	}
 
-	status = unmap_unix_group(grp, &map);
+	status = unmap_unix_group(grp);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		d_fprintf(stderr, _("Unmapping group %s failed with %s.\n"),
@@ -1583,7 +1582,7 @@ static int net_sam_provision(struct net_context *c, int argc, const char **argv)
 	char *ldap_uri = NULL;
 	char *p;
 	struct smbldap_state *ls;
-	GROUP_MAP gmap;
+	GROUP_MAP *gmap = NULL;
 	struct dom_sid gsid;
 	gid_t domusers_gid = -1;
 	gid_t domadmins_gid = -1;
@@ -1653,7 +1652,13 @@ static int net_sam_provision(struct net_context *c, int argc, const char **argv)
 
 	sid_compose(&gsid, get_global_sam_sid(), DOMAIN_RID_USERS);
 
-	if (!pdb_getgrsid(&gmap, gsid)) {
+	gmap = talloc_zero(tc, GROUP_MAP);
+	if (!gmap) {
+		d_printf(_("Out of memory!\n"));
+		goto failed;
+	}
+
+	if (!pdb_getgrsid(gmap, gsid)) {
 		LDAPMod **mods = NULL;
 		char *dn;
 		char *uname;
@@ -1710,16 +1715,16 @@ static int net_sam_provision(struct net_context *c, int argc, const char **argv)
 		}
 
 		if (is_ipa) {
-			if (!pdb_getgrsid(&gmap, gsid)) {
+			if (!pdb_getgrsid(gmap, gsid)) {
 				d_fprintf(stderr, _("Failed to read just "
 						    "created domain group.\n"));
 				goto failed;
 			} else {
-				domusers_gid = gmap.gid;
+				domusers_gid = gmap->gid;
 			}
 		}
 	} else {
-		domusers_gid = gmap.gid;
+		domusers_gid = gmap->gid;
 		d_printf(_("found!\n"));
 	}
 
@@ -1729,7 +1734,7 @@ domu_done:
 
 	sid_compose(&gsid, get_global_sam_sid(), DOMAIN_RID_ADMINS);
 
-	if (!pdb_getgrsid(&gmap, gsid)) {
+	if (!pdb_getgrsid(gmap, gsid)) {
 		LDAPMod **mods = NULL;
 		char *dn;
 		char *uname;
@@ -1786,16 +1791,16 @@ domu_done:
 		}
 
 		if (is_ipa) {
-			if (!pdb_getgrsid(&gmap, gsid)) {
+			if (!pdb_getgrsid(gmap, gsid)) {
 				d_fprintf(stderr, _("Failed to read just "
 						    "created domain group.\n"));
 				goto failed;
 			} else {
-				domadmins_gid = gmap.gid;
+				domadmins_gid = gmap->gid;
 			}
 		}
 	} else {
-		domadmins_gid = gmap.gid;
+		domadmins_gid = gmap->gid;
 		d_printf(_("found!\n"));
 	}
 
@@ -2039,7 +2044,7 @@ doma_done:
 		goto done;
 	}
 
-	if (!pdb_getgrgid(&gmap, pwd->pw_gid)) {
+	if (!pdb_getgrgid(gmap, pwd->pw_gid)) {
 		LDAPMod **mods = NULL;
 		char *dn;
 		char *uname;
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index cec65a9db7..06eed201f4 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -175,7 +175,7 @@ static int export_database (struct pdb_methods *in,
 
 static int export_groups (struct pdb_methods *in, struct pdb_methods *out)
 {
-	GROUP_MAP *maps = NULL;
+	GROUP_MAP **maps = NULL;
 	size_t i, entries = 0;
 	NTSTATUS status;
 
@@ -188,10 +188,10 @@ static int export_groups (struct pdb_methods *in, struct pdb_methods *out)
 	}
 
 	for (i=0; i<entries; i++) {
-		out->add_group_mapping_entry(out, &(maps[i]));
+		out->add_group_mapping_entry(out, maps[i]);
 	}
 
-	SAFE_FREE( maps );
+	TALLOC_FREE(maps);
 
 	return 0;
 }