svn commit: samba r1887 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

gd at samba.org gd at samba.org
Wed Aug 18 16:15:21 GMT 2004


Author: gd
Date: 2004-08-18 16:15:21 +0000 (Wed, 18 Aug 2004)
New Revision: 1887

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=1887&nolog=1

Log:
Fix deadlock loop in winbind's required_membership_sid-verification.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
   trunk/source/nsswitch/winbindd_pam.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c	2004-08-18 14:11:11 UTC (rev 1886)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c	2004-08-18 16:15:21 UTC (rev 1887)
@@ -123,7 +123,7 @@
            http://www.microsoft.com/windows2000/techinfo/administration/security/sidfilter.asp
          */
 
-	for (i = 0; i < info3->num_other_sids; j++) {
+	for (i = 0; i < info3->num_other_sids; i++) {
 		sid_copy(&all_sids[info3->num_groups2 + i + 2],
 			 &info3->other_sids[j].sid);
 		j++;

Modified: trunk/source/nsswitch/winbindd_pam.c
===================================================================
--- trunk/source/nsswitch/winbindd_pam.c	2004-08-18 14:11:11 UTC (rev 1886)
+++ trunk/source/nsswitch/winbindd_pam.c	2004-08-18 16:15:21 UTC (rev 1887)
@@ -123,7 +123,7 @@
            http://www.microsoft.com/windows2000/techinfo/administration/security/sidfilter.asp
          */
 
-	for (i = 0; i < info3->num_other_sids; j++) {
+	for (i = 0; i < info3->num_other_sids; i++) {
 		sid_copy(&all_sids[info3->num_groups2 + i + 2],
 			 &info3->other_sids[j].sid);
 		j++;



More information about the samba-cvs mailing list