summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1998-11-17 17:38:13 +0000
committerLuke Leighton <lkcl@samba.org>1998-11-17 17:38:13 +0000
commit0c7aa2e61a194f08e099df50ac26de893e4fbee9 (patch)
tree9a9edb5d57f4c6b0210d938e987b466f744e557f
parent74d539f5573a3ed3ff1b96c54752a389da4c3e14 (diff)
downloadsamba-0c7aa2e61a194f08e099df50ac26de893e4fbee9.tar.gz
samba-0c7aa2e61a194f08e099df50ac26de893e4fbee9.tar.bz2
samba-0c7aa2e61a194f08e099df50ac26de893e4fbee9.zip
swapped username:uid:[groupridlist]:[aliasridlist] to
u:u:a:g (This used to be commit 2f456ed92ffbf596945a9ec800c373495fc4e38a)
-rw-r--r--source3/passdb/smbpassgroup.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/passdb/smbpassgroup.c b/source3/passdb/smbpassgroup.c
index 4636c08c94..9454becc99 100644
--- 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..:aliasrid1,aliasrid2..:
+ * username:uid:domainrid1,domainrid2..:aliassid1,aliassid2..:
*/
/*
@@ -125,36 +125,36 @@ static struct smb_passwd *getsmbfilegrpent(void *vp,
/* 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]);
}
}
/* 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]);
}
}