Changeset 143 for trunk/src/sh_utmp.c

Timestamp:

Oct 31, 2007, 1:09:26 AM (17 years ago)

Author:

rainer

Message:

Bugfixes and threaded process check.

File:

• trunk/src/sh_utmp.c (modified) (22 diffs)

trunk/src/sh_utmp.c

@@ -79 +79 @@
 #include "sh_modules.h"
 #include "sh_utmp.h"
-
+#include "sh_pthread.h"
+
+SH_MUTEX_EXTERN(mutex_thread_nolog);
 
 #ifdef TM_IN_SYS_TIME
@@ -300 +302 @@
   if (sh_utmpfile == NULL) 
     {
+      SH_MUTEX_LOCK(mutex_thread_nolog);
       fd = (int) aud_open (FIL__, __LINE__, SL_NOPRIV, 
                            sh_utmppath, O_RDONLY, 0);
+      SH_MUTEX_UNLOCK(mutex_thread_nolog);
       if (fd >= 0)
         {
@@ -313 +317 @@
         {
           error = errno;
+          SH_MUTEX_LOCK(mutex_thread_nolog);
           sh_error_handle ((-1), FIL__, __LINE__, error, MSG_E_ACCESS,
                            (long) sh.real.uid, sh_utmppath);
+          SH_MUTEX_UNLOCK(mutex_thread_nolog);
           SL_RET0(_("sh_utmp_setutent"));
         }
@@ -489 +495 @@
     return SH_MOD_FAILED;
 #ifdef HAVE_PTHREAD
-  if (arg != NULL && arg->initval < 0)
+  if (arg != NULL && arg->initval < 0 && sh.flag.isdaemon == S_TRUE)
     {
       if (0 == sh_pthread_create(sh_threaded_module_run, (void *)arg))
@@ -559 +565 @@
   if (ShUtmpActive == BAD)
     SL_RETURN( (-1), _("sh_utmp_check"));
+  SH_MUTEX_LOCK(mutex_thread_nolog);
   sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_UT_CHECK);
+  SH_MUTEX_UNLOCK(mutex_thread_nolog);
   sh_utmp_check_internal (1);
 
@@ -579 +587 @@
   tmp[0] = '='; tmp[1] = '\0';
   (void) sl_strlcat (tmp, c, 32);
+  SH_MUTEX_LOCK(mutex_thread_nolog);
   retval = sh_error_set_level (tmp, &ShUtmpLoginSolo);
+  SH_MUTEX_UNLOCK(mutex_thread_nolog);
   SL_RETURN(retval, _("sh_utmp_set_login_solo"));
 }
@@ -591 +601 @@
   tmp[0] = '='; tmp[1] = '\0';
   (void) sl_strlcat (tmp, c, 32);
+  SH_MUTEX_LOCK(mutex_thread_nolog);
   retval = sh_error_set_level (tmp, &ShUtmpLoginMulti);
+  SH_MUTEX_UNLOCK(mutex_thread_nolog);
   SL_RETURN(retval, _("sh_utmp_set_login_multi"));
 }
@@ -603 +615 @@
   tmp[0] = '='; tmp[1] = '\0';
   (void) sl_strlcat (tmp, c, 32);
+  SH_MUTEX_LOCK(mutex_thread_nolog);
   retval = sh_error_set_level (tmp, &ShUtmpLogout);
+  SH_MUTEX_UNLOCK(mutex_thread_nolog);
   SL_RETURN(retval, _("sh_utmp_set_logout_good"));
 }
@@ -616 +630 @@
   if (val <= 0)
     {
+      SH_MUTEX_LOCK(mutex_thread_nolog);
       sh_error_handle ((-1), FIL__, __LINE__, EINVAL, MSG_EINVALS,
                        _("utmp timer"), c);
+      SH_MUTEX_UNLOCK(mutex_thread_nolog);
       retval = -1;
     }
@@ -823 +839 @@
           ) {
         status = sh_utmp_login_a(user->name);
+        SH_MUTEX_LOCK(mutex_thread_nolog);
         (void) sh_unix_time (user->time, ttt, TIM_MAX);
         sh_error_handle( ShUtmpLoginSolo, FIL__, __LINE__, 0,
@@ -843 +860 @@
                          status
                          );
+        SH_MUTEX_UNLOCK(mutex_thread_nolog);
       } else
         if (0 != sh_utmp_is_virtual(ut->ut_line, user->ut_host))
           {       
             status = sh_utmp_login_a(user->name);
+            SH_MUTEX_LOCK(mutex_thread_nolog);
             (void) sh_unix_time (user->time, ttt, TIM_MAX);
             sh_error_handle( ShUtmpLoginMulti, FIL__, __LINE__, 0,
@@ -867 +886 @@
                              status
                              );
+            SH_MUTEX_UNLOCK(mutex_thread_nolog);
           }
       
@@ -882 +902 @@
         {
           status = sh_utmp_login_r(user->name);
+          SH_MUTEX_LOCK(mutex_thread_nolog);
           (void) sh_unix_time (ut->ut_time, ttt, TIM_MAX);
           sh_error_handle( ShUtmpLogout, FIL__, __LINE__, 0,
@@ -902 +923 @@
                            status
                            );
+          SH_MUTEX_UNLOCK(mutex_thread_nolog);
           userold->next = user->next;
           if (user == userlist)
@@ -912 +934 @@
         {
           (void) sl_strlcpy(terminated_line, ut->ut_line, UT_HOSTSIZE);
+          SH_MUTEX_LOCK(mutex_thread_nolog);
           (void) sh_unix_time (ut->ut_time, ttt, TIM_MAX);
           sh_error_handle( ShUtmpLogout, FIL__, __LINE__, 0,
@@ -918 +941 @@
                            ttt, 0
                            );
+          SH_MUTEX_UNLOCK(mutex_thread_nolog);
         }
       SL_RET0(_("sh_utmp_addlogin"));
@@ -943 +967 @@
       userlist         = user;
 
+      SH_MUTEX_LOCK(mutex_thread_nolog);
       (void) sh_unix_time (user->time, ttt, TIM_MAX);
-
-
       sh_error_handle( ShUtmpLoginSolo, FIL__, __LINE__, 0,
 #if defined(HAVE_UTHOST) && defined(HAVE_UTADDR)
@@ -965 +988 @@
                        1
                        );
+      SH_MUTEX_UNLOCK(mutex_thread_nolog);
       sh_utmp_login_morechecks(ut);
     }
   else  /* probably a logout */
     {
+      SH_MUTEX_LOCK(mutex_thread_nolog);
       (void) sh_unix_time (ut->ut_time, ttt, TIM_MAX);
-
       sh_error_handle( ShUtmpLogout, FIL__, __LINE__, 0,
 #if defined(HAVE_UTHOST) && defined(HAVE_UTADDR)
@@ -990 +1014 @@
                        1
                        );
+      SH_MUTEX_UNLOCK(mutex_thread_nolog);
       sh_utmp_logout_morechecks(user);
       userold->next = user->next;
@@ -1014 +1039 @@
   struct SH_UTMP_S * ut;
   unsigned long this_read = 0;
+  int           val_retry;
 
   SL_ENTER(_("sh_utmp_check_internal"));
@@ -1019 +1045 @@
   /* error if no access
    */
-  if (0 != retry_lstat(FIL__, __LINE__, mode_path[mode], &buf)) 
+  do {
+    val_retry = /*@-unrecog@*/lstat ( mode_path[mode], &buf)/*@+unrecog@*/;
+  } while (val_retry < 0 && errno == EINTR);
+
+  if (0 != val_retry) 
     {
       error = errno;
+      SH_MUTEX_LOCK(mutex_thread_nolog);
       sh_error_handle((-1), FIL__, __LINE__, error, MSG_E_ACCESS,
                       (long) sh.real.uid, mode_path[mode]);
+      SH_MUTEX_UNLOCK(mutex_thread_nolog);
       SL_RET0(_("sh_utmp_check_internal"));
     }
@@ -1043 +1075 @@
   if (/*@-usedef@*/buf.st_size < lastsize/*@+usedef@*/ && mode < 2) 
     { 
+      SH_MUTEX_LOCK(mutex_thread_nolog);
       sh_error_handle((-1), FIL__, __LINE__, 0, MSG_UT_ROT,
                       mode_path[mode]);
+      SH_MUTEX_UNLOCK(mutex_thread_nolog);
       lastread = 0;
 #ifndef USE_SETUTENT