Changeset 29

Timestamp:

Apr 11, 2006, 1:48:18 PM (19 years ago)

Author:

rainer

Message:

Fixes for test suite, OpenBSD portability, self-resolving, and suidchk patch by Neil

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• scripts/README (modified) (1 diff)
• scripts/samhainrc_update.sh (modified) (1 diff)
• src/make-tests.sh (modified) (1 diff)
• src/sh_extern.c (modified) (2 diffs)
• src/sh_suidchk.c (modified) (1 diff)
• src/sh_unix.c (modified) (3 diffs)
• src/sh_utils.c (modified) (6 diffs)
• src/slib.c (modified) (1 diff)
• test/test.sh (modified) (1 diff)
• test/testcompile.sh (modified) (2 diffs)
• test/testrun_2.sh (modified) (2 diffs)
• test/testrun_2a.sh (modified) (2 diffs)
• test/testrun_2b.sh (modified) (2 diffs)

trunk/docs/Changelog

@@ -1 +1 @@
 2.2.0:
+        * patch by Neil Gorsuch for suidchk.c (do not scan lustre, afs, mmfs)
+        * fix sh_ext_popen (OpenBSD needs non-null argv[0] in execve)
+        * fix make_tests.sh portability (echo '"\n"' does not work on OpenBSD)
+        * fix bug in sh_utils_obscurename (check isascii)
+        * scan h_aliases for FQDN if h_name is not
         * add copyright/license info to test scripts
         * add copyright/license info to deployment system scripts
         * support server-to-server relay
-        * new CL option --server-port
+        * new CL option --server-port 
         * minor improvements in manual
         * patch by Yoann Vandoorselaere for sh_prelude.c
         * allow --longopt arg as well as --longopt=arg
-        * verify checksum of growing log files
+        * verify checksum of growing log files (up to previous size)
         * rewrite of the test suite
         * added a bit of unit testing

trunk/scripts/README

@@ -40 +40 @@
    This script will do this automatically. Run 'samhainrc_update.sh -h'
    for usage instructions. You may need to change the location of the
-   samhainrc file by editing the line 'SAMHAIN_CFG="/etc/samhainrc"'
+   samhainrc file by editing the line 'cfgfile="/etc/samhainrc"'
    at the beginning of the script.
  

trunk/scripts/samhainrc_update.sh

@@ -1 @@
-#!/bin/bash
-# ----------------------------------------------------------------------------- 
-# @brief: update the kernel options in the samhain configuration
-#         file, after a new kernel has been compiled
-# @author: marc heisterkamp <marzheister@web.de>
-# ----------------------------------------------------------------------------- 
-
-SAMHAIN_CFG="/etc/samhainrc"
-
-BLUE="[34;01m"
-CYAN="[36;01m"
-GREEN="[32;01m"
-DARK_GREEN="[32m"
-RED="[31;01m"
-PURPLE="[35;01m"
-WHITE="[37;01m"
-DARK_GRAY="[30;01m"
-LIGHT_GRAY="[37m"
-YELLOW="[33;01m"
-BROWN="[33m"
-OFF="[0m"
-
-
-SYSTEM_MAP=""
-new_cfg=''
-scriptname="$0"
-
-# global variables for system adresses (extracted from System.map)
-SYS_CALL=''
-SYS_CALL_TABLE=''
-PROC_ROOT=''
-PROC_ROOT_IOPS=''
-PROC_ROOT_LOOKUP=''
-
-# Make sure the user has root permissions
-if [ $UID -ne 0 ] ; then
-  echo "You must be root to run this script. Exiting."
-  exit 1
+#! /bin/sh
+
+# -----------------------------------------------------------------------
+# The default configuration file
+# -----------------------------------------------------------------------
+
+cfgfile="/etc/samhainrc"
+
+# -----------------------------------------------------------------------
+# Be Bourne compatible
+# -----------------------------------------------------------------------
+
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
 fi
 
-
-#------------------------------------------------------------------------------
-# usage 
-#------------------------------------------------------------------------------
-function print_usage() {
-
-  cat >&2 <<EOHELP
-
-  update the samhainrc configuration file with new kernel system addresses
-  (i.e: after kernel compilation) by extracting these from the new System.map 
-  file
-
-  SYNOPSIS
-     $scriptname [ ${GREEN}--help${OFF} ]
-                           [ ${GREEN}--nocolor${OFF} ]
-                           [ ${GREEN}--print-only${OFF} ] <System.map>
-                           [ ${GREEN}--update${OFF} ]     <System.map>
-
-  OPTIONS
-     ${GREEN}-h${OFF} ${GREEN}--help${OFF}
-        Show help. 
-
-     ${GREEN}--nocolor${OFF}
-        Disable color hilighting for non ANSI-compatible terms.
-
-     ${GREEN}-p${OFF} ${GREEN}--print-only${OFF} <System.map>
-        Print the extracted system adresses and do not write them to the 
-        samhain configuration file. 
-
-     ${GREEN}-u${OFF} ${GREEN}--update${OFF} <System.map>
-        Update the samhainrc configuration file with new kernel system
-        addresses from the given System.map file 
-
-EOHELP
- exit 0
-}
-
-
-#------------------------------------------------------------------------------
-# parses the command line options 
-# param in: all parameters given to the script 
-#------------------------------------------------------------------------------
-function parse_cmd_line() {
-
-  # parse the command-line
-  while [ -n "$1" ]; do
-    case "$1" in
-      --help|-h) 
-        print_usage
-        ;;
-      --nocolor|-n)
-        unset DARK_GREEN GREEN RED BROWN LIGHT_GRAY WHITE OFF 
-        ;;
-      --print-only|-p)
-        shift
-        SYSTEM_MAP="$1"
-        get_system_addresses
-        print_system_addresses
-        break
-        ;;
-      --update|-u)
-        shift
-        SYSTEM_MAP="$1"
-        get_system_addresses
-        print_system_addresses
-        replace_system_addresses
-        ;;
-      -*)
-        echo "$scriptname: unknown option $1. Exiting" >&2
-        exit 1
-        ;;
-    esac
-    shift
-  done
-}
-
-
-#------------------------------------------------------------------------------
-# extract system adresses from given System.map file and save to global
-# variables 
-#------------------------------------------------------------------------------
-function get_system_addresses() { 
-
-  if [ -z "$SYSTEM_MAP" ] ; then
-    echo
-    echo "No System.map specified. Exiting" >&2
-    echo
-    exit 1
+programname="$0"
+sysmap=
+
+# -----------------------------------------------------------------------
+# Print help
+# -----------------------------------------------------------------------
+
+showhelp() {
+    echo
+    echo "$programname - update samhain config file after kernel update"
+    echo
+    echo "OPTIONS:"
+    echo
+    echo " -u|--update </path/to/System.map>"
+    echo "         Update the configuration file with new"
+    echo "         settings as taken from </path/to/System.map>"
+    echo
+    echo " -c|--config-file </path/to/config-file>"
+    echo "         Specify the configuration file to update [${cfgfile}]"
+    echo
+    echo " -p|--print-only </path/to/System.map>"
+    echo "         Print new settings, don't modify anything"
+    echo
+    echo " -h|--help"
+    echo "         Print this help"
+    echo
+    echo " -n|--nocolor"
+    echo "         (ignored, legacy support)"
+    echo
+}
+
+
+# -----------------------------------------------------------------------
+# Death strikes
+# -----------------------------------------------------------------------
+
+die() {
+    echo ${1+"$@"} >&2
+    { (exit 1); exit 1; }
+}
+
+# -----------------------------------------------------------------------
+# Get new settings from </path/to/System.map>
+# -----------------------------------------------------------------------
+
+system_call=
+syscall_table=
+proc_root=
+proc_root_inode_operations=
+proc_root_lookup=
+
+get_new_settings() {
+
+    if [ -z "$sysmap" ]; then
+        die "No System.map specified"
+    fi
+    if [ -f "$sysmap" ]; then
+        if [ -r "$sysmap" ]; then
+            system_call=`egrep '[[:alnum:]]{8}[[:space:]]+[[:alpha:]]{1}[[:space:]]+system_call$' ${sysmap} | awk '{ print $1 }'`
+            syscall_table=`egrep '[[:alnum:]]{8}[[:space:]]+[[:alpha:]]{1}[[:space:]]+sys_call_table$' ${sysmap} | awk '{ print $1 }'`
+            proc_root=`egrep '[[:alnum:]]{8}[[:space:]]+[[:alpha:]]{1}[[:space:]]+proc_root$' ${sysmap} | awk '{ print $1 }'`
+            proc_root_inode_operations=`egrep '[[:alnum:]]{8}[[:space:]]+[[:alpha:]]{1}[[:space:]]+proc_root_inode_operations$' ${sysmap} | awk '{ print $1 }'`
+            proc_root_lookup=`egrep '[[:alnum:]]{8}[[:space:]]+[[:alpha:]]{1}[[:space:]]+proc_root_lookup$' ${sysmap} | awk '{ print $1 }'`
+        else
+            die "System.map ${sysmap} not readable"
+        fi
+    else
+        die "System.map ${sysmap} not found"
+    fi
+    test -z "${system_call}" && die "system_call not found in ${cfgfile}"
+    test -z "${syscall_table}" && die "sys_call_table not found in ${cfgfile}"
+    test -z "${proc_root}" && die "proc_root not found in ${cfgfile}"
+    test -z "${proc_root_inode_operations}" && die "proc_root_inode_operations not found in ${cfgfile}"
+    test -z "${proc_root_lookup}" && die "proc_root_lookup not found in ${cfgfile}"
+
+}
+
+# -----------------------------------------------------------------------
+# Print new settings
+# -----------------------------------------------------------------------
+
+run_print() {
+    get_new_settings
+    echo
+    echo "KernelSystemCall =     0x${system_call}"
+    echo "KernelSyscallTable =   0x${syscall_table}"
+    echo "KernelProcRoot =       0x${proc_root}"
+    echo "KernelProcRootIops =   0x${proc_root_inode_operations}"
+    echo "KernelProcRootLookup = 0x${proc_root_lookup}"
+    echo
+}
+
+# -----------------------------------------------------------------------
+# Replace a setting
+# -----------------------------------------------------------------------
+
+# set ignorecase
+# search pattern
+# delete current line
+# insert
+# single dot == end of insert text
+# save and exit
+
+run_replace() {
+    item="$1"
+    address="$2"
+    ex -s "$cfgfile" <<EOF
+:set ic
+:/^[[:blank:]]*$1[[:blank:]]*=
+:d
+:i
+$item = $address
+.
+:x
+EOF
+}
+
+# -----------------------------------------------------------------------
+# Add a setting
+# -----------------------------------------------------------------------
+
+# set ignorecase
+# search pattern ([Kernel] section)
+# append (next line)
+# single dot == end of insert text
+# save and exit
+
+run_add() {
+    item="$1"
+    address="$2"
+    ex -s "$cfgfile" <<EOF
+:set ic
+:/^[[:space:]]*\[Kernel\]
+:a
+$item = $address
+.
+:x
+EOF
+}
+
+# -----------------------------------------------------------------------
+# Update with new settings
+# -----------------------------------------------------------------------
+
+run_update() {
+
+    get_new_settings
+
+    if [ -z "$cfgfile" ]; then
+        die "No configuration file specified"
+    fi
+    if [ ! -w "$cfgfile" ]; then
+        die "Configuration file ${cfgfile} not writeable"
+    fi
+    egrep '^[[:space:]]*\[Kernel\]' "$cfgfile" >/dev/null
+    if [ $? -ne 0 ]; then
+        die "No [Kernel] section in configuration file $cfgfile"
+    fi
+
+    cat "$cfgfile" | egrep -i 'KernelProcRootLookup' >/dev/null
+    if [ $? -eq 0 ]; then
+        run_replace 'KernelProcRootLookup' "0x${proc_root_lookup}"
+    else
+        run_add 'KernelProcRootLookup' "0x${proc_root_lookup}"
+    fi
+ 
+    cat "$cfgfile" | egrep -i 'KernelProcRootIops' >/dev/null
+    if [ $? -eq 0 ]; then
+        run_replace 'KernelProcRootIops' "0x${proc_root_inode_operations}"
+    else
+        run_add 'KernelProcRootIops' "0x${proc_root_inode_operations}"
+    fi
+
+    cat "$cfgfile" | egrep -i 'KernelProcRoot[[:space:]]*=' >/dev/null
+    if [ $? -eq 0 ]; then
+        run_replace 'KernelProcRoot' "0x${proc_root}"
+    else
+        run_add 'KernelProcRoot' "0x${proc_root}"
+    fi
+
+    cat "$cfgfile" | egrep -i 'KernelSyscallTable' >/dev/null
+    if [ $? -eq 0 ]; then
+        run_replace 'KernelSyscallTable' "0x${syscall_table}"
+    else
+        run_add 'KernelSyscallTable' "0x${syscall_table}"
+    fi
+
+    cat "$cfgfile" | egrep -i 'KernelSystemCall' >/dev/null
+    if [ $? -eq 0 ]; then
+        run_replace 'KernelSystemCall' "0x${system_call}"
+    else
+        run_add 'KernelSystemCall' "0x${system_call}"
+    fi
+
+}
+
+# -----------------------------------------------------------------------
+# Parse command line
+# -----------------------------------------------------------------------
+
+sysmap=
+action=
+
+for option
+do
+
+  # If the previous option needs an argument, assign it.
+  #
+  if test -n "$opt_prev"; then
+    eval "$opt_prev=\$option"
+    eval export "$opt_prev"
+    opt_prev=
+    continue
   fi
 
-  if [ ! -f "$SYSTEM_MAP" ] ; then
-    echo
-    echo "Could not find System.map: $SYSTEM_MAP. Exiting" >&2
-    echo
-    exit 1
-  fi
-
-  # 1. this is the address of system_call (grep system_call System.map) 
-  #    KernelSystemCall = 0xc0106cf8
-  SYS_CALL="0x`grep system_call $SYSTEM_MAP | cut -d' ' -f1`"
-
-  # 2. this is the address of sys_call_table (grep ' sys_call_table' System.map) 
-  #    KernelSyscallTable = 0xc01efb98
-  SYS_CALL_TABLE="0x`grep sys_call_table $SYSTEM_MAP | cut -d' ' -f1`"
-
-  # 3. this is the address of proc_root (grep ' proc_root$' System.map) 
-  #    KernelProcRoot = 0xc01efb98
-  PROC_ROOT="0x`grep ' proc_root$' $SYSTEM_MAP | cut -d' ' -f1`"
-
-  # 4. this is the address of proc_root_inode_operations 
-  #    (grep proc_root_inode_operations System.map) 
-  #    KernelProcRootIops = 0xc01efb98
-  PROC_ROOT_IOPS="0x`grep proc_root_inode_operations $SYSTEM_MAP | cut -d' ' -f1`"
-
-  # 5. this is the address of proc_root_lookup
-  #    (grep proc_root_lookup System.map) 
-  #    KernelProcRootLookup = 0xc01efb98
-  PROC_ROOT_LOOKUP="0x`grep proc_root_lookup $SYSTEM_MAP | cut -d' ' -f1`"
-}
-
-
-#------------------------------------------------------------------------------
-# extract system adresses from given System.map file and save to global
-# variables 
-#------------------------------------------------------------------------------
-function replace_system_addresses() { 
-
-  if [ -z "$SAMHAIN_CFG" ] ; then
-    echo "Could not find your samhainrc config file: $SAMHAIN_CFG. Exiting" >&2
-    exit 1
-  fi
-
-  echo
-  echo "Replacing current kernel system addresses in: $SAMHAIN_CFG"
-
-  # 1. replace current 'KernelSystemCall' setting
-  new_cfg=`sed -e "s/^\(KernelSystemCall[[:blank:]]*=\)[[:blank:]]*\(.*\)/\1 ${SYS_CALL}/" $SAMHAIN_CFG` 
-
-  # 2. replace current 'KernelSyscallTable' setting
-  new_cfg=`echo "$new_cfg" | sed -e "s/^\(KernelSyscallTable[[:blank:]]*=\)[[:blank:]]*\(.*\)/\1 ${SYS_CALL_TABLE}/"` 
-
-  # 3. replace current 'KernelProcRoot' setting
-  new_cfg=`echo "$new_cfg" | sed -e "s/^\(KernelProcRoot[[:blank:]]*=\)[[:blank:]]*\(.*\)/\1 ${PROC_ROOT}/"` 
-
-  # 4. replace current 'KernelProcRootIops' setting
-  new_cfg=`echo "$new_cfg" | sed -e "s/^\(KernelProcRootIops[[:blank:]]*=\)[[:blank:]]*\(.*\)/\1 ${PROC_ROOT_IOPS}/"` 
-
-  # 5. replace current 'KernelSystemCall' setting
-  new_cfg=`echo "$new_cfg" | sed -e "s/^\(KernelProcRootLookup[[:blank:]]*=\)[[:blank:]]*\(.*\)/\1 ${PROC_ROOT_LOOKUP}/"` 
-
-  echo "Backup old samhainrc $SAMHAIN_CFG to $SAMHAIN_CFG.bak"
-
-  # backup old samhainrc config file 
-  mv "$SAMHAIN_CFG" "$SAMHAIN_CFG.bak"
-
-  # write new samhainrc config file 
-  echo "$new_cfg" > "$SAMHAIN_CFG"
-
-  echo "Successfully updated kernel system addresses."
-  echo
-}
-
-
-#------------------------------------------------------------------------------
-# print samhain required system adresses 
-#------------------------------------------------------------------------------
-function print_system_addresses() {
-
-  echo 
-  echo "your kernel system addresses from: `basename $SYSTEM_MAP`"
-  echo 
-  echo "  KernelSystemCall     = $SYS_CALL"
-  echo "  KernelSyscallTable   = $SYS_CALL_TABLE"
-  echo "  KernelProcRoot       = $PROC_ROOT"
-  echo "  KernelProcRootIops   = $PROC_ROOT_IOPS"
-  echo "  KernelProcRootLookup = $PROC_ROOT_LOOKUP"
-  echo 
-
-}
-
-if [ $# -eq 0 ] ; then
-  print_usage
+  case "$option" in
+      -*=*) 
+          optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` 
+          ;;
+      *) 
+          optarg= 
+          ;;
+  esac
+
+  case "$option" in
+
+      -h|--help)
+          showhelp
+          exit 0
+          ;;
+
+      -n|--nocolor)
+          ;;
+
+      -c|--config-file)
+          opt_prev=cfgfile
+          ;;
+
+      -c=* | --config-file=*)
+          cfgfile="$optarg"
+          ;;
+
+      -p|--print-only)
+          opt_prev=sysmap
+          action=p
+          ;;
+
+
+      -p=* | --print-only=*)
+          sysmap="$optarg"
+          action=p
+          ;;
+    
+      -u|--update)
+          opt_prev=sysmap
+          action=u
+          ;;
+
+      -u=* | --update=*)
+          sysmap="$optarg"
+          action=u
+          ;;
+
+  esac
+
+done
+
+if [ x"$action" = xp ]; then
+    run_print
+    exit 0
 fi
-
-parse_cmd_line $*
-
-exit 0
+if [ x"$action" = xu ]; then
+    run_update
+    exit 0
+fi
+
+showhelp
+exit 1

trunk/src/make-tests.sh

@@ -49 +49 @@
     CuSuiteDetails(suite, output);
     if (suite->failCount > 0)
-      fprintf(stderr, "%s\n", output->buffer);
+      fprintf(stderr, "%s%c", output->buffer, 0x0A);
     else
-      fprintf(stdout, "%s\n", output->buffer);
+      fprintf(stdout, "%s%c", output->buffer, 0x0A);
     return suite->failCount;
 }

trunk/src/sh_extern.c

@@ -115 +115 @@
   FILE * outf = NULL;
   char * envp[1];
-  char * argp[1];
+  char * argp[2];
 
   char * errfile;
@@ -133 +133 @@
    *         needs a valid *envp[] with envp[0] = NULL;
    *         and similarly for argp
+   * OpenBSD finally needs non-null argp[0] ...
    */
+  argp[0] = task->command;
+  argp[1] = NULL;
   envp[0] = NULL;
-  argp[0] = NULL;
 
   /* 

trunk/src/sh_suidchk.c

@@ -525 +525 @@
               fs = filesystem_type (tmpcat, tmpcat, &buf);
               if (fs != NULL && 
+                  0 != strncmp (_("afs"),     fs, 3) && 
+                  0 != strncmp (_("devfs"),   fs, 5) &&
+                  0 != strncmp (_("iso9660"), fs, 7) &&
+                  0 != strncmp (_("lustre"),  fs, 6) &&
+                  0 != strncmp (_("mmfs"),    fs, 4) && 
+                  0 != strncmp (_("msdos"),   fs, 5) &&
                   0 != strncmp (_("nfs"),     fs, 3) && 
+                  0 != strncmp (_("nosuid"),  fs, 6) &&
                   0 != strncmp (_("proc"),    fs, 4) &&
-                  0 != strncmp (_("iso9660"), fs, 7) &&
-                  0 != strncmp (_("vfat"),    fs, 4) &&
-                  0 != strncmp (_("msdos"),   fs, 5) &&
-                  0 != strncmp (_("devfs"),   fs, 5) &&
-                  0 != strncmp (_("nosuid"),  fs, 6) 
+                  0 != strncmp (_("vfat"),    fs, 4) 
                   )
                 {

trunk/src/sh_unix.c

@@ -1451 +1451 @@
 #include <arpa/inet.h>
 
+char * sh_unix_h_name (struct hostent * host_entry)
+{
+        char ** p;
+        if (strchr(host_entry->h_name, '.')) {
+                return host_entry->h_name;
+        } else {
+                for (p = host_entry->h_aliases; *p; ++p) {
+                        if (strchr(*p, '.'))
+                                return *p;
+                }
+        }
+        return host_entry->h_name;
+}
+
 /* uname() on FreeBSD is broken, because the 'nodename' buf is too small
  * to hold a valid (leftmost) domain label.
@@ -1521 +1535 @@
   else
     {
-      sl_strlcpy (sh.host.name, he1->h_name, SH_PATHBUF);
+      sl_strlcpy (sh.host.name, sh_unix_h_name(he1), SH_PATHBUF);
     }
   
@@ -1569 +1583 @@
   if (he1 != NULL)
     {
-      sl_strlcpy (sh.host.name, he1->h_name, SH_PATHBUF);
+      sl_strlcpy (sh.host.name, sh_unix_h_name(he1), SH_PATHBUF);
     }
   else

trunk/src/sh_utils.c

@@ -1340 +1340 @@
   char * endptr = NULL;
 
-  SL_ENTER(_("sh_util_obscure_ex"));
+  SL_ENTER(_("sh_util_obscure_ok"));
 
   if (0 == sl_strncmp("all", str, 3))
@@ -1348 +1348 @@
           sh_obscure_index[i] = (unsigned char)1;
         }
-      SL_RETURN(0, _("sh_util_obscure_ex"));
+      SL_RETURN(0, _("sh_util_obscure_ok"));
     }
 
@@ -1359 +1359 @@
   if (i > 255)
     {
-      SL_RETURN(-1, _("sh_util_obscure_ex"));
+      SL_RETURN(-1, _("sh_util_obscure_ok"));
     }
   sh_obscure_index[i] = (unsigned char)1;
@@ -1370 +1370 @@
       if (i > 255)
         {
-          SL_RETURN(-1, _("sh_util_obscure_ex"));
+          SL_RETURN(-1, _("sh_util_obscure_ok"));
         }
       sh_obscure_index[i] = (unsigned char)1;
@@ -1376 +1376 @@
         ++endptr;
     }
-  SL_RETURN(0, _("sh_util_obscure_ex"));
+  SL_RETURN(0, _("sh_util_obscure_ok"));
 }
 
 int sh_util_obscurename (ShErrLevel level, char * name_orig, int flag)
 {
-  char * name = name_orig;
+  unsigned char * name = (unsigned char *) name_orig;
   char * safe;
   unsigned int i;
@@ -1393 +1393 @@
   while (*name != '\0') 
     {
-      if ( (*name) == '"'  || (*name) == '\t' ||
+      if ( (*name) >  0x7F || (*name) == '"'  || (*name) == '\t' ||
            (*name) == '\b' || (*name) == '\f' || 
            (*name) == '\n' || (*name) == '\r' ||

trunk/src/slib.c

@@ -1984 +1984 @@
     {
       TPT((0, FIL__, __LINE__, 
-           _("msg=<Error closing file.>, path=<%s>, fd=<%d>\n"), 
-           ofiles[fd]->path, fd));
+           _("msg=<Error closing file.>, path=<%s>, fd=<%d>, err=<%s>\n"), 
+           ofiles[fd]->path, fd, strerror(errno)));
     }
 

trunk/test/test.sh

@@ -185 +185 @@
 
 PW_DIR=`pwd`; export PW_DIR
+
+#
+# group/world writeable will cause problems
+#
+chmod go-w .
 #
 #

trunk/test/testcompile.sh

@@ -223 +223 @@
         if [ -z "$GPG" ]; then
             log_skip $num $MAXTEST 'gpg not in PATH'
+            let "num = num + 1" >/dev/null
         else
             if test -r "Makefile"; then
@@ -370 +371 @@
         if [ -z "$GPG" ]; then
             log_skip $num $MAXTEST 'gpg not in PATH'
-            let "num = num + 1" >/dev/null
-            log_skip $num $MAXTEST 'gpg not in PATH'
+            let "num = num + 3" >/dev/null
         else
             if test -r "Makefile"; then

trunk/test/testrun_2.sh

@@ -732 +732 @@
         rm -f ./.samhain_lock*
 
-        SHCLT=`./yule -P $SHPW | sed s%HOSTNAME%${SH_LOCALHOST}%`
+        SHCLT=`./yule -P $SHPW`
 
         if test x$? = x0; then
@@ -741 +741 @@
         fi
 
-        echo $SHCLT >> testrc_2
+        SHCLT1=`echo "${SHCLT}"  | sed s%HOSTNAME%${SH_LOCALHOST}%`
+        AHOST=`find_hostname`
+        SHCLT2=`echo "${SHCLT}"  | sed s%HOSTNAME%${AHOST}%`
+        
+
+        echo $SHCLT1 >> testrc_2
+        echo $SHCLT2 >> testrc_2
         cp testrc_2 testrc_22
 

trunk/test/testrun_2a.sh

@@ -197 +197 @@
         rm -f ./.samhain_lock
 
-        SHCLT=`./yule -P $SHPW | sed s%HOSTNAME%${SH_LOCALHOST}%`
+        SHCLT=`./yule -P $SHPW`
 
         if test x$? = x0; then
@@ -206 +206 @@
         fi
 
-        echo $SHCLT >> testrc_2
+        SHCLT1=`echo "${SHCLT}"  | sed s%HOSTNAME%${SH_LOCALHOST}%`
+        AHOST=`find_hostname`
+        SHCLT2=`echo "${SHCLT}"  | sed s%HOSTNAME%${AHOST}%`
+        
+
+        echo $SHCLT1 >> testrc_2
+        echo $SHCLT2 >> testrc_2
+
 
         cp    ./testrc_2       ./rc.${SH_LOCALHOST}

trunk/test/testrun_2b.sh

@@ -144 +144 @@
     rm -f ./.samhain_lock
     
-    SHCLT=`./yule -P $SHPW | sed s%HOSTNAME%${SH_LOCALHOST}%`
+    SHCLT=`./yule -P $SHPW`
     
     if test x$? = x0; then
@@ -153 +153 @@
     fi
     
-    echo $SHCLT >> testrc_2
+    SHCLT1=`echo "${SHCLT}"  | sed s%HOSTNAME%${SH_LOCALHOST}%`
+    AHOST=`find_hostname`
+    SHCLT2=`echo "${SHCLT}"  | sed s%HOSTNAME%${AHOST}%`
+        
+
+    echo $SHCLT1 >> testrc_2
+    echo $SHCLT2 >> testrc_2
+
     
     cp    "${RCFILE_C}"              ./rc.${SH_LOCALHOST}