Changeset 142 for trunk/src/sh_utmp.c

Timestamp:

Oct 30, 2007, 12:17:00 AM (17 years ago)

Author:

rainer

Message:

Login watch runs in thread.

File:

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

trunk/src/sh_utmp.c

@@ -455 +455 @@
 static struct log_user   * userlist   = NULL;
 static time_t  lastcheck;
+static int     init_done = 0;
 
 /*************
@@ -461 +462 @@
  *
  *************/
-int sh_utmp_init (struct mod_type * arg)
-{
-  static int done = 0;
-  (void) arg;
+
+static int sh_utmp_init_internal ()
+{
 
   SL_ENTER(_("sh_utmp_init"));
@@ -472 +472 @@
   /* do not re-initialize after a re-configuration
    */
-  if (done == 1) {
+  if (init_done == 1) {
     SL_RETURN( (0), _("sh_utmp_init"));
   }
@@ -480 +480 @@
   sh_utmp_check_internal (2); /* current logins */
   sh_utmp_check_internal (0);
-  done = 1;
+  init_done = 1;
   SL_RETURN( (0), _("sh_utmp_init"));
+}
+
+int sh_utmp_init (struct mod_type * arg)
+{
+  if (ShUtmpActive == BAD)
+    return SH_MOD_FAILED;
+#ifdef HAVE_PTHREAD
+  if (arg != NULL && arg->initval < 0)
+    {
+      if (0 == sh_pthread_create(sh_threaded_module_run, (void *)arg))
+        return SH_MOD_THREAD;
+      else
+        return SH_MOD_FAILED;
+    }
+#endif
+  return sh_utmp_init_internal();
 }
 
@@ -509 +525 @@
   (void) sh_utmp_login_clean();
 #endif
+  /* Reset the flag, such that the module
+   * can be re-enabled.
+   */
+  ShUtmpActive       = S_TRUE;
+  init_done          = 0;
   SL_RETURN( (0), _("sh_utmp_end"));
 }
@@ -536 +557 @@
 {
   SL_ENTER(_("sh_utmp_check"));
+  if (ShUtmpActive == BAD)
+    SL_RETURN( (-1), _("sh_utmp_check"));
   sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_UT_CHECK);
   sh_utmp_check_internal (1);