Fix copy/paste error in previous patch

* security.cc (convert_samba_sd): Fix copy/paste error in previous
	patch.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2015-08-14 21:55:42 +02:00
parent 5de7f2e6c3
commit 36d500e425
2 changed files with 7 additions and 2 deletions

View File

@ -1,9 +1,14 @@
2015-08-14 Corinna Vinschen <corinna@vinschen.de>
* security.cc (convert_samba_sd): Fix copy/paste error in previous
patch.
2015-08-14 Corinna Vinschen <corinna@vinschen.de> 2015-08-14 Corinna Vinschen <corinna@vinschen.de>
* fhandler_disk_file.cc (fhandler_base::fstat_by_nfs_ea): Only try * fhandler_disk_file.cc (fhandler_base::fstat_by_nfs_ea): Only try
to map user and group info per RFC2307 if account info is fetched to map user and group info per RFC2307 if account info is fetched
from Windows account DB. from Windows account DB.
(convert_samba_sd): Ditto. * security.cc (convert_samba_sd): Ditto.
2015-08-14 Corinna Vinschen <corinna@vinschen.de> 2015-08-14 Corinna Vinschen <corinna@vinschen.de>

View File

@ -1158,7 +1158,7 @@ convert_samba_sd (security_descriptor &sd_ret)
if (uid < UNIX_POSIX_OFFSET && (pwd = internal_getpwuid (uid))) if (uid < UNIX_POSIX_OFFSET && (pwd = internal_getpwuid (uid)))
ace_sid.getfrompw (pwd); ace_sid.getfrompw (pwd);
} }
else if (sid_sub_auth (ace_sid, 0) == 1 /* group */ else if (sid_sub_auth (ace_sid, 0) == 2 /* group */
&& cygheap->pg.nss_grp_db ()) && cygheap->pg.nss_grp_db ())
{ {
struct group *grp; struct group *grp;