Changeset 205 for trunk/src

Timestamp:

Dec 22, 2008, 10:05:34 PM (16 years ago)

Author:

katerina

Message:

New option LooseDirCheck (ticket #132). Also, replace _exit() with raise(SIGKILL).

Location:

trunk/src

Files:

• samhain_stealth.c (modified) (2 diffs)
• sh_hash.c (modified) (2 diffs)
• sh_processcheck.c (modified) (3 diffs)
• sh_readconf.c (modified) (1 diff)
• sh_unix.c (modified) (6 diffs)

trunk/src/samhain_stealth.c

@@ -277 +277 @@
       fprintf(stdout, _("   -s hide file 'what' in PS image 'where'\n"));
       fprintf(stdout, _("   -g get hidden data from PS image 'where'\n"));
-      fprintf(stdout, _("      (output to stdout)\n\n"));
+      fprintf(stdout, _("      (output to stdout)\n"));
       fprintf(stdout, _("   -o size of file 'where' = offset to "\
                         "end-of-file\n"));
-      fprintf(stdout, _("      (same as wc -c).\n"));
+      fprintf(stdout, _("      (same as wc -c).\n\n"));
+      fprintf(stdout, _(" Example: let bar.ps be the ps file, and foo the config file\n"));
+      fprintf(stdout, _("   1) extract with: samhain_stealth -g bar.ps >foo\n"));
+      fprintf(stdout, _("   2) hide with:    samhain_stealth -s bar.ps foo\n\n"));
 
       fprintf(stdout, _(" This program hides a file in an UNCOMPRESSED "\
@@ -294 +297 @@
       fprintf(stdout, _(" The program does not check the compression type of "\
               "the PS file.\n"));
-      fprintf(stdout, _(" Just have a look at the result to check.\n\n"));
+      fprintf(stdout, _(" Just have a look at the result to check.\n"));
       return;
 }

trunk/src/sh_hash.c

@@ -1440 +1440 @@
 }
 
+static int sh_loosedircheck = S_FALSE;
+
+int sh_hash_loosedircheck(const char * str)
+{
+  return sh_util_flagval(str, &sh_loosedircheck);
+}
+
 
 static void sh_hash_pushdata_int (file_type * buf, char * fileHash)
@@ -3056 +3063 @@
     }
   change_code[10] = '\0';
+
+  /* --- Directories special case ---
+   */
+  if (p->theFile.c_mode[0] == 'd'                               &&
+      0 == (modi_mask & ~(MODI_SIZ|MODI_ATM|MODI_CTM|MODI_MTM)) && 
+      sh_loosedircheck == S_TRUE)
+    {
+      modi_mask = 0;
+    }
 
   /* --- Report full details. ---

trunk/src/sh_processcheck.c

@@ -1092 +1092 @@
  * with PID = i + 1024
  */
+static size_t p_store = 0;
+
 static int openvz_ok(short * res, size_t i)
 {
+
   if (sh_prochk_openvz == S_FALSE) {
     return 0;
@@ -1112 +1115 @@
     }
 
-  if (openvz_hidden)
-    {
+  if (openvz_hidden > 0)
+    {
+      p_store = i;
       --openvz_hidden;
+      return 1;
+    }
+  else if (i == p_store)
+    {
       return 1;
     }
@@ -1409 +1417 @@
   sh_prochk_interval = SH_PROCHK_INTERVAL;
   sh_prochk_openvz   = S_FALSE;
+  p_store            = 0;
+  openvz_hidden      = 0;
 
   sh_prochk_free_list(process_check);

trunk/src/sh_readconf.c

@@ -932 +932 @@
     sh_unix_setcheckacl },
 #endif
+  { N_("loosedircheck"),      SH_SECTION_MISC,   SH_SECTION_NONE,
+    sh_hash_loosedircheck },
   { N_("addokchars"),         SH_SECTION_MISC,   SH_SECTION_NONE,
     sh_util_obscure_ok },

trunk/src/sh_unix.c

@@ -480 +480 @@
   sl_strlcat(msg, details, 128);
   (void) safe_logger (thesignal, method, msg);
-  _exit(EXIT_FAILURE);
+  raise(SIGKILL);
 }
 
@@ -526 +526 @@
           safe_logger (mysignal, 0, NULL);
         }
-      _exit(mysignal);
+      raise(SIGKILL);
     }
   else
@@ -582 +582 @@
   if (immediate_exit_fast < 2)
     safe_logger (mysignal, 0, NULL);
-  _exit(mysignal);
+  raise(SIGKILL);
 #else
 
@@ -610 +610 @@
   else if (immediate_exit_fast != 0)
     {
-      _exit(mysignal);
+      raise(SIGKILL);
     }
 
@@ -1450 +1450 @@
       }
   }
+
+#ifdef HAVE_TZSET
+  tzset();
+#endif
 
   SL_RET0(_("sh_unix_zeroenv"));
@@ -4975 +4979 @@
     (tv.tv_usec - save_tv.tv_usec);
   if (difftv > 500000)
-    _exit(6);
+    raise(SIGKILL);
 #endif
   sh_not_traced += signum;