sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

swapped username:uid:[groupridlist]:[aliasridlist] to

Browse Source 
u:u:a:g
This commit is contained in:
Luke Leighton -
parent 0d21e1e609
commit 2f456ed92f
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
source/passdb/smbpassgroup.c
View File

@ -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,24 +125,6 @@ static struct smb_passwd *getsmbfilegrpent(void *vp,
/* Skip the ':' */
p++;
if (grp_rids != NULL && num_grps != NULL)
{
int i;
p = get_numlist(p, grp_rids, num_grps);
if (p == NULL)
{
DEBUG(0,("getsmbfilegrpent: invalid line\n"));
return NULL;
}
for (i = 0; i < (*num_grps); i++)
{
(*grp_rids)[i] = pwdb_gid_to_group_rid((*grp_rids)[i]);
}
}
/* Skip the ':' */
p++;
if (als_rids != NULL && num_alss != NULL)
{
int i;
@ -158,6 +140,24 @@ static struct smb_passwd *getsmbfilegrpent(void *vp,
}
}
/* Skip the ':' */
p++;
if (grp_rids != NULL && num_grps != NULL)
{
int i;
p = get_numlist(p, grp_rids, num_grps);
if (p == NULL)
{
DEBUG(0,("getsmbfilegrpent: invalid line\n"));
return NULL;
}
for (i = 0; i < (*num_grps); i++)
{
(*grp_rids)[i] = pwdb_gid_to_group_rid((*grp_rids)[i]);
}
}
pwfile = Get_Pwnam(pw_buf.smb_name, False);
if (pwfile == NULL)
{