Changeset 92 for trunk/src

Timestamp:

Feb 18, 2007, 5:23:32 PM (18 years ago)

Author:

rainer

Message:

Move fd closing more towards program start. Fix OpenBSD 4.0 compatibility for kernel check.

Location:

trunk/src

Files:

• kern_head.c (modified) (3 diffs)
• samhain.c (modified) (3 diffs)
• sh_unix.c (modified) (2 diffs)

trunk/src/kern_head.c

@@ -726 +726 @@
   if      (utbuf.release[0] == '3')
     which = 38;
+  else if (utbuf.release[0] == '4')
+    which = 40;
 #else
   if      (utbuf.release[0] == '4')
@@ -791 +793 @@
     printf("\n/* Kernel %s, machine %s -- use table %s */\n\n",
                  utbuf.release, utbuf.machine, "callz_fbsd5");
-  else if (which == 38)
+  else if (which == 38 || which == 40)
     printf("\n/* Kernel %s, machine %s -- use table %s */\n\n",
                  utbuf.release, utbuf.machine, "callz_obsd");
@@ -817 +819 @@
       }
   }
-  else if (which == 38) {
+  else if (which == 38 || which == 40) {
     while ((callz_obsd[i] != NULL) && (i < SYS_MAXSYSCALL))
       {

trunk/src/samhain.c

@@ -914 +914 @@
       default:
         times = 0;
-        while (times < 120) {
+        while (times < 300) {
           respid = waitpid(pid, &status, WNOHANG|WUNTRACED);
           if ((pid_t)-1 == respid)
@@ -1122 +1122 @@
   SL_ENTER(_("main"));
 
+  /* --- Close all but first three file descriptors. ---
+   */
+  sh_unix_closeall(3, -1); /* at program start */
+
+
   if (argc >= 2 && 0 != getuid() &&
       (0 == strcmp(argv[1], _("start")) ||
@@ -1311 +1316 @@
   sh.flag.opts = S_FALSE;
   
-
-  /* close all other files
-   */
-  sh_unix_closeall(3, -1); /* after processing CL options; only stderr here */
-
 
   /* --- Get user info. ---

trunk/src/sh_unix.c

@@ -1849 +1849 @@
   if (goDaemon == 1)
     {
-      /* close all file descriptors 
+      /* Close first tree file descriptors 
        */ 
-      sh_unix_closeall (0, -1);  /* if running as daemon */
+      close (0);  /* if running as daemon */
+      close (1);  /* if running as daemon */
+      close (2);  /* if running as daemon */
 
       /* Enable full error logging
@@ -1913 +1915 @@
   else
     {
-      sh_unix_closeall(3, -1);  /* if not daemon */
       sh_error_enable_unsafe (S_TRUE);
 #if defined(HAVE_LIBPRELUDE)