diff options
Diffstat (limited to 'src/samhain.c')
| -rw-r--r-- | src/samhain.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/samhain.c b/src/samhain.c index 43503cd..f5883e9 100644 --- a/src/samhain.c +++ b/src/samhain.c @@ -76,7 +76,7 @@ #include "sh_nmail.h" #include "sh_tiger.h" -#include "sh_gpg.h" +#include "sh_sig.h" #include "sh_mem.h" #include "sh_xfer.h" #include "sh_tools.h" @@ -347,7 +347,11 @@ void sh_init (void) sig_force_silent = 0; /* SIGTSTP */ sh_global_check_silent = 0; sh_load_delta_flag = 0; - strcpy ( sh_sig_msg, _("None")); + sh_sig_msg[4] = '\0'; + sh_sig_msg[3] = 'e'; + sh_sig_msg[2] = 'n'; + sh_sig_msg[1] = 'o'; + sh_sig_msg[0] = 'N'; #ifdef MKB_01 ErrFlag[1] |= (1 << 0); @@ -772,6 +776,7 @@ static void exit_handler(void) sh_files_delglobstack (); sh_hash_hashdelete(); sh_files_hle_reg (NULL); + (void) sh_ignore_clean (); /* * Only flush on exit if running as deamon. * Otherwise we couldn't run another instance @@ -833,7 +838,7 @@ static void exit_handler(void) if (sh.flag.isdaemon == S_TRUE) (void) sh_unix_rm_pid_file (); if (skey != NULL) - memset (skey, (int) '\0', sizeof(sh_key_t)); + memset (skey, 0, sizeof(sh_key_t)); /* --- Exit. --- */ @@ -876,6 +881,7 @@ static pid_t * procdirSamhain (void) if (NULL == (dp = opendir(_("/proc")))) { + /* cppcheck-suppress resourceLeak */ return NULL; } @@ -1374,7 +1380,7 @@ void do_reconf() } else { - sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_MOD_OK, + sh_error_handle ((-1), FIL__, __LINE__, status, MSG_MOD_OK, _(modList[modnum].name)); modList[modnum].initval = status; } @@ -1901,9 +1907,9 @@ int undef_main(int argc, char * argv[]) #if defined(SH_WITH_SERVER) && !defined(SH_WITH_CLIENT) -#if (defined(WITH_GPG) || defined(WITH_PGP)) +#if defined(WITH_GPG) /* log startup */ - sh_gpg_log_startup (); + sh_sig_log_startup (); #else sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_1H, sh.prg_name, (long) sh.real.uid, @@ -1924,9 +1930,9 @@ int undef_main(int argc, char * argv[]) if (sh.flag.checkSum == SH_CHECK_CHECK) { -#if (defined(WITH_GPG) || defined(WITH_PGP)) +#if defined(WITH_GPG) /* log startup */ - sh_gpg_log_startup (); + sh_sig_log_startup (); #else sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_2H, sh.prg_name, (long) sh.real.uid, @@ -1936,9 +1942,9 @@ int undef_main(int argc, char * argv[]) } else { -#if (defined(WITH_GPG) || defined(WITH_PGP)) +#if defined(WITH_GPG) /* log startup */ - sh_gpg_log_startup (); + sh_sig_log_startup (); #else sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_1H, sh.prg_name, (long) sh.real.uid, |