Changeset 493 for trunk

Timestamp:

Nov 1, 2015, 4:18:59 PM (9 years ago)

Author:

katerina

Message:

Fix for ticket #391 (timezone offset calculation).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_unix.c (modified) (1 diff)
• test/testhash.sh (modified) (1 diff)

trunk/docs/Changelog

@@ -1 +1 @@
 4.1.1:
+        * fix problem with timezone calculation on month rollover for
+        negative timezones (west of GMT; reported by Bond)
         * fix problem with rotated logfiles when content is always constant,
         i.e. checksum does not change (reported by Bond).

trunk/src/sh_unix.c

@@ -2316 +2316 @@
       /* Check for datum wrap-around.
        */
-      if      (aa.tm_year < bb.tm_year)
+      if      ((aa.tm_mday == 1) && (aa.tm_mday < bb.tm_mday))
+        sign = ( 1);
+      else if (aa.tm_year < bb.tm_year)
         sign = (-1);
       else if (aa.tm_mon  < bb.tm_mon)

trunk/test/testhash.sh

@@ -63 +63 @@
         fi
         #
-        ${TOP_SRCDIR}/configure --enable-debug=gdb --quiet $TRUST --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file --enable-db-reload '--enable-login-watch' '--enable-mounts-check' ${C_LOGFILE} '--enable-port-check' '--enable-message-queue' '--enable-suidcheck' '--disable-dnmalloc'
+        ${TOP_SRCDIR}/configure --enable-debug=gdb --quiet $TRUST --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file --enable-db-reload '--enable-login-watch' '--enable-mounts-check' ${C_LOGFILE} '--enable-port-check' '--enable-process-check' '--enable-message-queue' '--enable-suidcheck' '--disable-dnmalloc'
         #
         fail=0