Changeset 134 for trunk/src/trustfile.c

Timestamp:

Oct 26, 2007, 12:20:10 AM (17 years ago)

Author:

rainer

Message:

More thread-safety changes.

File:

• trunk/src/trustfile.c (modified) (3 diffs)

trunk/src/trustfile.c

@@ -507 +507 @@
 #endif
 
+  int retval = SL_FALSE;
+
   SL_ENTER(_("onlytrustedingrp"));
 
@@ -603 +605 @@
   /* now check ALL users for their GID !!!
    */
+  SH_MUTEX_LOCK(mutex_pwent);
+
   while (NULL != (w = sh_getpwent())) 
     {
@@ -643 +647 @@
 #endif
               tf_baduid = w->pw_uid;
-              SL_IRETURN(SL_FALSE, _("onlytrustedingrp"));
+              retval = SL_FALSE;
+              goto out;
+              /* SL_IRETURN(SL_FALSE, _("onlytrustedingrp")); */
             }
         }
     }
+  retval = SL_TRUE;
+
+ out:
 
 #ifdef HAVE_ENDPWENT
   sh_endpwent();
 #endif
+
+  SH_MUTEX_UNLOCK(mutex_pwent);
+
   /* TEST_ONLY */
 #endif
-
   /* #ifdef HAVE_GETPWENT */
 #endif
 
 #ifdef TRUST_DEBUG
-  fprintf(stderr,
-          "trustfile: group %ld:  all members are trusted users --> OK\n", 
-          (UID_CAST)grp);
+  if (retval == SL_TRUE)
+    fprintf(stderr,
+            "trustfile: group %ld:  all members are trusted users --> OK\n", 
+            (UID_CAST)grp);
 #endif
   /* all found
    */
-  SL_IRETURN(SL_TRUE, _("onlytrustedingrp"));
+  SL_IRETURN(retval, _("onlytrustedingrp"));
 }