Changeset 553 for trunk

Timestamp:

Feb 27, 2020, 8:16:48 PM (5 years ago)

Author:

katerina

Message:

Fix for ticket #443 (Incompatibility with older gpg versions).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (3 diffs)
• docs/FAQ.html (modified) (1 diff)
• docs/HOWTO-client+server.html (modified) (1 diff)
• docs/HOWTO-samhain+GnuPG.html (modified) (1 diff)
• docs/README (modified) (1 diff)
• src/sh_sig.c (modified) (1 diff)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 4.4.0)
+AM_INIT_AUTOMAKE(samhain, 4.4.1)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ +1 @@
+4.4.1:
+        * fix compatibility problem with older (version 2.0.x) GnuPG
+
 4.4.0:
         * support for OpenBSD signify as alternative to GnuPG
@@ -573 +576 @@
         * Evaluate glob patterns for each run of file check
         * Add compile option to disable compiling with SSP
-        * Run SUID check in seperate thread
+        * Run SUID check in separate thread
         * By default disable scanning ..namedfork/rsrc (deprecated by Apple)
 
@@ -1480 +1483 @@
           on solaris - noticed by Bob Bloom)
         * sh_suidcheck: don't truncate quarantined file if nlink > 1 
-        * fix Install.sh (no --seperate-output with --radiolist); patch by
+        * fix Install.sh (no --separate-output with --radiolist); patch by
           Greg Kimberly
 

trunk/docs/FAQ.html

@@ -800 +800 @@
 
      This will enable/disable logging of the server timestamp for client
-     messages. The server timestamp will be written to a seperate record,
+     messages. The server timestamp will be written to a separate record,
      with <i>log_ref</i> set to the value of 
      <i>log_index</i> of the corresponding client message.<br><br></dd>

trunk/docs/HOWTO-client+server.html

@@ -144 +144 @@
 Client and server are 
 <b>distict applications</b>, and must be
-built seperately. By default, installation names and paths (e.g.
+built separately. By default, installation names and paths (e.g.
 the configuration file) are
 different. Do not blame us if you abuse './configure' options to 

trunk/docs/HOWTO-samhain+GnuPG.html

@@ -329 +329 @@
 emails signed by them).
 </p><p>
-So which is the correct file? Here we have to consider two seperate
+So which is the correct file? Here we have to consider two separate
 cases:
 </p>

trunk/docs/README

@@ -137 +137 @@
 
         NOTE: client and server are __distict__ applications, and must be
-        built seperately. By default, installation names and paths are
+        built separately. By default, installation names and paths are
         different. Do not blame us if you abuse './configure' options to 
         cause name clashes, if you install both on the same host.

trunk/src/sh_sig.c

@@ -1296 +1296 @@
   TPT(((0), FIL__, __LINE__, _("msg=<Close pipe>\n")));
 
-  if (n_newsig != n_goodsig || n_newsig != n_validsig || n_newsig > 1)
+  if (n_goodsig != n_validsig || n_newsig > 1 || n_goodsig > 1)
     {
         sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_SUBGEN,