Changeset 68 for trunk/include


Ignore:
Timestamp:
Oct 30, 2006, 12:03:44 AM (18 years ago)
Author:
rainer
Message:

Update trunk to samhain 2.3

Location:
trunk/include
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/rijndael-api-fst.h

    r1 r68  
    2525#define     MODE_CBC              2 /*  Are we ciphering in CBC mode?   */
    2626#define     MODE_CFB1             3 /*  Are we ciphering in 1-bit CFB mode? */
     27#ifndef     TRUE
    2728#define     TRUE                  1
     29#endif
     30#ifndef     FALSE
    2831#define     FALSE                 0
     32#endif
    2933#define     BITSPERBLOCK        128 /* Default number of bits in a cipher block */
    3034

  • trunk/include/samhain.h

    r40 r68  
    316316     } while (0)
    317317
     318#define SH_VALIDATE_GE(a,b) \
     319     do { \
     320         if ((a) < (b)) safe_fatal(#a " < " #b, FIL__, __LINE__);\
     321     } while (0)
     322
    318323#if defined(HAVE_MLOCK) && !defined(HAVE_BROKEN_MLOCK)
    319324#define MLOCK(a, b) \

  • trunk/include/sh_cat.h

    r1 r68  
    130130 MSG_UT_ROT,     
    131131
     132#endif
     133
     134#ifdef SH_USE_PROCESSCHECK
     135 MSG_PCK_CHECK, 
     136 MSG_PCK_OK,     
     137 MSG_PCK_HIDDEN,
     138 MSG_PCK_FAKE,   
     139 MSG_PCK_MISS,   
     140#endif
     141
     142#ifdef SH_USE_PORTCHECK
     143 MSG_PORT_REPORT,
    132144#endif
    133145

  • trunk/include/sh_kern.h

    r1 r68  
    1212int sh_kern_null  (void);
    1313
    14 int sh_kern_set_activate (char * c);
    15 int sh_kern_set_severity (char * c);
    16 int sh_kern_set_timer    (char * c);
    17 int sh_kern_set_idt      (char * c);
    18 
    19 /* FIXME: document these */
    20 int sh_kern_set_sct_addr (char * c);
    21 int sh_kern_set_sc_addr  (char * c);
    22 int sh_kern_set_proc_root (char * c);
    23 int sh_kern_set_proc_root_lookup (char * c);
    24 int sh_kern_set_proc_root_iops (char * c);
     14int sh_kern_set_activate (const char * c);
     15int sh_kern_set_severity (const char * c);
     16int sh_kern_set_timer    (const char * c);
     17int sh_kern_set_idt      (const char * c);
     18int sh_kern_set_sct_addr (const char * c);
     19int sh_kern_set_sc_addr  (const char * c);
     20int sh_kern_set_proc_root (const char * c);
     21int sh_kern_set_proc_root_lookup (const char * c);
     22int sh_kern_set_proc_root_iops (const char * c);
    2523
    2624extern sh_rconf sh_kern_table[];

  • trunk/include/sh_modules.h

    r1 r68  
    77{
    88  char * the_opt;
    9   int (*func)(char * opt);
     9  int (*func)(const char * opt);
    1010} sh_rconf;
    1111

  • trunk/include/sh_suidchk.h

    r1 r68  
    1212int sh_suidchk_free_schedule (void);
    1313
    14 int sh_suidchk_set_activate   (char * c);
    15 int sh_suidchk_set_severity   (char * c);
    16 int sh_suidchk_set_timer      (char * c);
    17 int sh_suidchk_set_schedule   (char * c);
    18 int sh_suidchk_set_exclude    (char * c);
    19 int sh_suidchk_set_fps        (char * c);
    20 int sh_suidchk_set_yield      (char * c);
    21 int sh_suidchk_set_quarantine (char * c);
    22 int sh_suidchk_set_qmethod    (char * c);
    23 int sh_suidchk_set_qdelete    (char * c);
     14int sh_suidchk_set_activate   (const char * c);
     15int sh_suidchk_set_severity   (const char * c);
     16int sh_suidchk_set_timer      (const char * c);
     17int sh_suidchk_set_schedule   (const char * c);
     18int sh_suidchk_set_exclude    (const char * c);
     19int sh_suidchk_set_fps        (const char * c);
     20int sh_suidchk_set_yield      (const char * c);
     21int sh_suidchk_set_quarantine (const char * c);
     22int sh_suidchk_set_qmethod    (const char * c);
     23int sh_suidchk_set_qdelete    (const char * c);
    2424
    2525

  • trunk/include/sh_unix.h

    r40 r68  
    139139  char             link_c_mode[11];
    140140  int              linkisok;
     141  char           * attr_string;
    141142} file_type;
     143
     144extern int sh_unix_check_selinux;
     145extern int sh_unix_check_acl;
    142146
    143147/* mlock utilities
    … …  
    157161 */
    158162int sh_unix_uselocaltime (const char * c);
     163
     164/* whether to perform selinux/acl checks
     165 */
     166#ifdef USE_XATTR
     167int sh_unix_setcheckselinux (const char * c);
     168#endif
     169#ifdef USE_ACL
     170int sh_unix_setcheckacl (const char * c);
     171#endif
    159172
    160173/* set I/O limit

  • trunk/include/sh_userfiles.h

    r1 r68  
    1616int sh_userfiles_reconf (void);
    1717
    18 int sh_userfiles_set_uid (char * str);
    19 int sh_userfiles_add_file(char *c);
    20 int sh_userfiles_set_interval(char *c);
    21 int sh_userfiles_set_active(char *c);
     18int sh_userfiles_set_uid (const char * str);
     19int sh_userfiles_add_file(const char *c);
     20int sh_userfiles_set_interval(const char *c);
     21int sh_userfiles_set_active(const char *c);
    2222int sh_userfiles_check_internal();
    2323

  • trunk/include/sh_utils.h

    r34 r68  
    6363char * sh_util_strsep (char **str, const char *delim);
    6464
     65/* compactify verbose acl text
     66 */
     67char * sh_util_acl_compact (char * buf, ssize_t len);
     68
    6569/* set signature type HASH-TIGER/HMAC-TIGER
    6670 */
    … …  
    8488 */
    8589int sh_util_hidesetup(const char * c);
     90
     91/* valif utf-8 string
     92 */
     93int sh_util_valid_utf8 (const unsigned char * str);
     94
     95/* filenames are utf8
     96 */
     97int sh_util_obscure_utf8 (const char * c);
    8698
    8799/* exceptions to obscure name check

  • trunk/include/sh_utmp.h

    r1 r68  
    1212int sh_utmp_null (void);
    1313
    14 int sh_utmp_set_login_activate (char * c);
    15 int sh_utmp_set_login_solo     (char * c);
    16 int sh_utmp_set_login_multi    (char * c);
    17 int sh_utmp_set_logout_good    (char * c);
    18 int sh_utmp_set_login_timer    (char * c);
     14int sh_utmp_set_login_activate (const char * c);
     15int sh_utmp_set_login_solo     (const char * c);
     16int sh_utmp_set_login_multi    (const char * c);
     17int sh_utmp_set_logout_good    (const char * c);
     18int sh_utmp_set_login_timer    (const char * c);
    1919
    2020extern sh_rconf sh_utmp_table[];
Note: See TracChangeset for help on using the changeset viewer.