Changeset 483


Ignore:
Timestamp:
Sep 1, 2015, 7:38:58 PM (4 years ago)
Author:
katerina
Message:

Fix for ticket #381 (BSD suid check compile failure).

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r481 r483  
    1212dnl start
    1313dnl
    14 AM_INIT_AUTOMAKE(samhain, 4.0.0.rc1)
     14AM_INIT_AUTOMAKE(samhain, 4.1.0)
    1515AC_DEFINE([SAMHAIN], 1, [Application is samhain])
    1616AC_CANONICAL_HOST
  • trunk/docs/Changelog

    r481 r483  
     14.1.0:
     2        * fix missing definition for a sh_dummy_ var on BSD et al.
     3        (reported by Andrew)
     4
    154.0.0:
     6        * fix and document default settings for mounts check
    27        * new -w CL option to wait on scan completion
    38        * new option ReportCheckflags
  • trunk/src/sh_dbIO.c

    r481 r483  
    413413}
    414414
     415static void hexdump(unsigned char * data, size_t size)
     416{
     417  unsigned int count =0;
     418  char ith[3];
     419
     420  do {
     421    int2hex(data[count], ith); ith[2] = '\0';
     422    printf("%2s", ith);
     423    ++count;
     424    if (count % 40 == 0) putc('\n', stdout);
     425  } while (count < size);
     426}
     427
    415428static size_t dbIO_fread_struct (sh_filestore_t * ptr, FILE *stream,
    416429                                 const char * path, int * errflag)
     
    440453              char try[5];
    441454
     455              if (1 == 0)
     456                hexdump((unsigned char *)&old_struct, sizeof(old_struct));
    442457              memset(&try_struct, '\0', sizeof(try_struct));
    443458              if (!memcmp(&old_struct, &try_struct, sizeof(try_struct)))
  • trunk/src/sh_suidchk.c

    r481 r483  
    23472347   * Avoids the 'clobbered by longjmp' warning.
    23482348   */
    2349   sh_dummy_type = (void*) &type;
     2349  sh_dummy_2229_type = (void*) &type;
    23502350
    23512351  while (type == NULL
     
    23672367   * Avoids the 'clobbered by longjmp' warning.
    23682368   */
    2369   sh_dummy_type = (void*) &type;
     2369  sh_dummy_2229_type = (void*) &type;
    23702370
    23712371  if (statfs (relpath, &fss, sizeof (struct statfs), 0) == -1)
     
    23952395   * Avoids the 'clobbered by longjmp' warning.
    23962396   */
    2397   sh_dummy_type = (void*) &type;
     2397  sh_dummy_2229_type = (void*) &type;
    23982398
    23992399  if (statvfs (relpath, &fss) == -1)
     
    24362436   * Avoids the 'clobbered by longjmp' warning.
    24372437   */
    2438   sh_dummy_type = (void*) &type;
     2438  sh_dummy_2229_type = (void*) &type;
    24392439
    24402440  if (S_ISLNK (statp->st_mode))
Note: See TracChangeset for help on using the changeset viewer.