Changes from APPLIANCE_HEAD:

[ira/wip.git] / source3 / passdb / smbpassgroup.c

diff --git a/source3/passdb/smbpassgroup.c b/source3/passdb/smbpassgroup.c
index 9454becc999cba4f853cb3d06caf4c71a05c628e..4636c08c9492c0a4282e2ebab287823c624da005 100644 (file)
--- a/source3/passdb/smbpassgroup.c
+++ b/source3/passdb/smbpassgroup.c
@@ -97,7 +97,7 @@ static struct smb_passwd *getsmbfilegrpent(void *vp,
                /*
                 * The line we have should be of the form :-
                 * 
-                * username:uid:domainrid1,domainrid2..:aliassid1,aliassid2..:
+                * username:uid:domainrid1,domainrid2..:aliasrid1,aliasrid2..:
                 */
 
                /*
@@ -125,36 +125,36 @@ static struct smb_passwd *getsmbfilegrpent(void *vp,
                /* Skip the ':' */
                p++;
 
-               if (als_rids != NULL && num_alss != NULL)
+               if (grp_rids != NULL && num_grps != NULL)
                {
                        int i;
-                       p = get_numlist(p, als_rids, num_alss);
+                       p = get_numlist(p, grp_rids, num_grps);
                        if (p == NULL)
                        {
                                DEBUG(0,("getsmbfilegrpent: invalid line\n"));
                                return NULL;
                        }
-                       for (i = 0; i < (*num_alss); i++)
+                       for (i = 0; i < (*num_grps); i++)
                        {
-                               (*als_rids)[i] = pwdb_gid_to_alias_rid((*als_rids)[i]);
+                               (*grp_rids)[i] = pwdb_gid_to_group_rid((*grp_rids)[i]);
                        }
                }
 
                /* Skip the ':' */
                p++;
 
-               if (grp_rids != NULL && num_grps != NULL)
+               if (als_rids != NULL && num_alss != NULL)
                {
                        int i;
-                       p = get_numlist(p, grp_rids, num_grps);
+                       p = get_numlist(p, als_rids, num_alss);
                        if (p == NULL)
                        {
                                DEBUG(0,("getsmbfilegrpent: invalid line\n"));
                                return NULL;
                        }
-                       for (i = 0; i < (*num_grps); i++)
+                       for (i = 0; i < (*num_alss); i++)
                        {
-                               (*grp_rids)[i] = pwdb_gid_to_group_rid((*grp_rids)[i]);
+                               (*als_rids)[i] = pwdb_gid_to_alias_rid((*als_rids)[i]);
                        }
                }