Changeset 422
- Timestamp:
- Dec 21, 2012, 7:56:16 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure.ac
r420 r422 12 12 dnl start 13 13 dnl 14 AM_INIT_AUTOMAKE(samhain, 3.0. 8)14 AM_INIT_AUTOMAKE(samhain, 3.0.9) 15 15 AC_DEFINE([SAMHAIN], 1, [Application is samhain]) 16 16 AC_CANONICAL_HOST -
trunk/docs/Changelog
r421 r422 1 1 3.0.9: 2 * Fixed a Cygwin compile warning 3 * Change logic in samhain.c to make sure inotify doesn't cause 4 excessive full scans 5 * Add option IgnoreTimestampsOnly in Windows registry check (ignore 6 changes if only timestamp has changed) 2 7 * Fix the probe command (misses clients if their startup message 3 8 has been missed) -
trunk/src/samhain.c
r416 r422 1988 1988 */ 1989 1989 if (sh.flag.checkSum == SH_CHECK_INIT || 1990 (sh.flag.inotify & SH_INOTIFY_DOSCAN) != 0 ||1991 1990 (sh.flag.checkSum == SH_CHECK_CHECK && 1992 1991 (sh.flag.isdaemon == S_FALSE && sh.flag.loop == S_FALSE))) … … 1997 1996 } 1998 1997 else if (sh.flag.checkSum == SH_CHECK_CHECK || 1998 (sh.flag.inotify & SH_INOTIFY_DOSCAN) != 0 || 1999 1999 (sh.flag.update == S_TRUE && 2000 2000 (sh.flag.isdaemon == S_TRUE || sh.flag.loop == S_TRUE))) -
trunk/src/sh_getopt.c
r415 r422 562 562 if (num > 0) fputc (',', stdout); 563 563 fputs (_(" logfile monitor"), stdout); ++num; 564 #endif 565 #if defined(USE_REGISTRY_CHECK) 566 if (num > 0) fputc ('\n', stdout); 567 fputs (_(" Windows registry"), stdout); ++num; 564 568 #endif 565 569 if (num == 0) -
trunk/src/sh_ipvx.c
r380 r422 87 87 int sh_ipvx_isany (struct sh_sockaddr * a) 88 88 { 89 #if defined(HOST_IS_CYGWIN) 90 /* 91 * Cygwin implementation gives 'missing braces around initializer' 92 * warning, thus replace it with correct version. 93 */ 94 #undef IN6ADDR_ANY_INIT 95 #define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } } 96 #endif 97 89 98 #if defined(USE_IPVX) 90 99 struct in6_addr anyaddr = IN6ADDR_ANY_INIT; -
trunk/src/sh_registry.c
r403 r422 58 58 static int sh_reg_add_stop (const char *s); 59 59 static int sh_reg_add_ign (const char *s); 60 static int sh_reg_ign_time (const char *s); 60 61 61 62 #define STOP_FALSE 0 … … 77 78 }, 78 79 { 80 N_("ignoretimestamponly"), 81 sh_reg_ign_time, 82 }, 83 { 79 84 N_("singlekey"), 80 85 sh_reg_add_key, … … 105 110 static time_t sh_reg_check_interval = SH_REGISTRY_INTERVAL; 106 111 static int sh_reg_check_severity = SH_ERR_SEVERE; 112 static int ShRegIgnTime = S_FALSE; 107 113 108 114 struct regkeylist { … … 128 134 129 135 SL_RETURN((value), _("sh_reg_set_active")); 136 } 137 138 static int sh_reg_ign_time(const char *s) 139 { 140 int value; 141 142 SL_ENTER(_("sh_reg_ign_time")); 143 144 value = sh_util_flagval(s, &ShRegIgnTime); 145 146 SL_RETURN((value), _("sh_reg_ign_time")); 130 147 } 131 148 … … 710 727 doUpdate = S_TRUE; 711 728 } 712 else if (save.val0 != totalSize || 713 ((time_t) save.val1) != fTime || 729 else if (save.val0 != totalSize || 714 730 save.val2 != cSubKeys || 715 731 save.val3 != cValues || 716 0 != strcmp(save.checksum, hashbuf)) 732 0 != strcmp(save.checksum, hashbuf) || 733 ( (((time_t) save.val1) != fTime) && (ShRegIgnTime == S_FALSE)) ) 717 734 { 718 735 /* Change detected */
Note:
See TracChangeset
for help on using the changeset viewer.