Index: /trunk/Makefile.in =================================================================== --- /trunk/Makefile.in (revision 414) +++ /trunk/Makefile.in (revision 415) @@ -960,5 +960,5 @@ rpmspec-light: samhain.spec @echo "Stripping docs from samhain.spec"; \ - cat samhain.spec | sed 's,make DESTDIR=$${RPM_BUILD_ROOT} install,make DESTDIR=$${RPM_BUILD_ROOT} install-light,' | sed s,shkeep=yes,shkeep=no, | sed s,%doc.*,, | sed s,%attr.*,, > samhain.spec-light; \ + cat samhain.spec | sed 's,make DESTDIR=$${RPM_BUILD_ROOT} install,make DESTDIR=$${RPM_BUILD_ROOT} install-light,' | sed s,shkeep=yes,shkeep=no, | sed s,%doc.*,, | sed '/logrotate/! { s,%attr.*,, }' > samhain.spec-light; \ mv samhain.spec-light samhain.spec Index: /trunk/aclocal.m4 =================================================================== --- /trunk/aclocal.m4 (revision 414) +++ /trunk/aclocal.m4 (revision 415) @@ -1379,5 +1379,15 @@ # if test "x$GCC" = xyes; then - SAMHAIN_X86_64 + case "$host_os" in + *linux*) + SAMHAIN_X86_64 + ;; + *bsd*) + SAMHAIN_X86_64 + ;; + *) + SAMHAIN_X86_64 + ;; + esac fi fi Index: /trunk/configure.ac =================================================================== --- /trunk/configure.ac (revision 414) +++ /trunk/configure.ac (revision 415) @@ -12,5 +12,5 @@ dnl start dnl -AM_INIT_AUTOMAKE(samhain, 3.0.6) +AM_INIT_AUTOMAKE(samhain, 3.0.8) AC_DEFINE([SAMHAIN], 1, [Application is samhain]) AC_CANONICAL_HOST @@ -1425,28 +1425,56 @@ elif test "x${withval}" = "xoracle"; then - AC_MSG_CHECKING(for oracle in /usr /usr/local ORACLE_HOME) + + AC_MSG_CHECKING(for oracle in ORACLE_HOME /usr/local /usr) + oracle_directory="/usr /usr/local ${ORACLE_HOME}" for i in $oracle_directory; do - if test -r $i/rdbms/demo/oci.h; then - ORACLE_DIR=$i - fi - done + + ff=`find $i -name oci.h 2>/dev/null | tail -1` + if test "x$ff" = "x"; then + : + else + ORACLE_INC=`dirname $ff` + fi + + fg=`find $i -name libclntsh.so 2>/dev/null | tail -1` + if test "x$fg" = "x"; then + : + else + ORACLE_LIB=`dirname $fg` + fi + + done - if test -z "$ORACLE_DIR"; then + if test -z "$ORACLE_INC"; then + tmp="" for i in $oracle_directory; do - tmp="$tmp $i/rdbms/demo" + tmp="$tmp $i" done - FAIL_MESSAGE("OCI header file (oci.h)", $tmp) - else - for i in rdbms/demo rdbms/public network/public; do - ORACLE_CPP_FLAGS="$ORACLE_CPP_FLAGS -I$ORACLE_DIR/$i" - done - ORACLE_LIB_DIR="$ORACLE_DIR/lib" - AC_MSG_RESULT(yes) + FAIL_MESSAGE("OCI header file (oci.h) please define ORACLE_INC directory where oci.h resides", $tmp) + + elif test -z "$ORACLE_LIB"; then + + tmp="" + for i in $oracle_directory; do + tmp="$tmp $i" + done + FAIL_MESSAGE("OCI library file (libclntsh.so) please define ORACLE_LIB directory where libclntsh.so resides", $tmp) + + else + + ORACLE_CPP_FLAGS="-I$ORACLE_INC" + ORACLE_LIB_DIR="$ORACLE_LIB" + + AC_MSG_RESULT([$ORACLE_INC $ORACLE_LIB]) CPPFLAGS="${CPPFLAGS} ${ORACLE_CPP_FLAGS}" ORACLE_LIBS="-lclntsh" + + if test -r $ORACLE_LIB_DIR/libnnz11.so; then + ORACLE_LIBS="${ORACLE_LIBS} -lnnz11" + fi if test -r $ORACLE_LIB_DIR/libwtc9.so; then ORACLE_LIBS="${ORACLE_LIBS} -lwtc9" Index: /trunk/docs/Changelog =================================================================== --- /trunk/docs/Changelog (revision 414) +++ /trunk/docs/Changelog (revision 415) @@ -1,2 +1,20 @@ +3.0.8: + * rename to 3.0.8 for release + * useful exit status for samhainadmin.pl --examine + +3.0.7a: + * add ability to create RPM with preset password (use + env var PASSWORD) + * fix the rpm-light makefile target + * fix minor bug in samhain_setpwd.c (incorrect error message) + +3.0.7: + * update documentation for prelude + * fix configure to properly search for Oracle Instantclient SDK + * pass through TNS_ADMIN environment variable for Oracle + * optimize audit rules automatically + * zero out the html status file at server exit + * don't check for assembly optimization unless linux or *BSD + 3.0.6: * install logrotate script if /etc/logrotate.d is detected Index: /trunk/include/samhain.h =================================================================== --- /trunk/include/samhain.h (revision 414) +++ /trunk/include/samhain.h (revision 415) @@ -125,4 +125,6 @@ #define UINT32 unsigned short #define SINT32 short +#else +#error "No 32 bit integer type found" #endif Index: /trunk/include/sh_extern.h =================================================================== --- /trunk/include/sh_extern.h (revision 414) +++ /trunk/include/sh_extern.h (revision 415) @@ -1,4 +1,6 @@ #ifndef SH_EXTERN_H #define SH_EXTERN_H + +#include typedef struct @@ -40,10 +42,10 @@ * executes shell command */ -int sh_ext_popen_init (sh_tas_t * task, char * command); +int sh_ext_popen_init (sh_tas_t * task, char * command, char * argv0, ...) SH_GNUC_SENTINEL; /* * -- Execute command, return first line of output */ -int sh_ext_system (char * command); +int sh_ext_system (char * command, char * argv0, ...) SH_GNUC_SENTINEL; /* Index: /trunk/include/sh_files.h =================================================================== --- /trunk/include/sh_files.h (revision 414) +++ /trunk/include/sh_files.h (revision 415) @@ -22,4 +22,5 @@ void sh_audit_mark (const char * file); +void sh_audit_commit (); void sh_audit_delete_all (); char * sh_audit_fetch (char * file, time_t time, char * result, size_t rsize); Index: /trunk/samhain.spec.in =================================================================== --- /trunk/samhain.spec.in (revision 414) +++ /trunk/samhain.spec.in (revision 415) @@ -14,4 +14,5 @@ Packager: Andre Oliveira da Costa Provides: %{name} +Requires(pre): shadow-utils # dummy (fix configure warning) @@ -19,4 +20,6 @@ # no quotes here - aparently will be expanded literally + +%define password %(echo $PASSWORD) %define withpwd_prg x@clmytclient@ @@ -65,7 +68,14 @@ ./configure @mydefargs@ make +%if "%{withpwd_prg}" == "xDSH_WITH_CLIENT" +%if 0%{?password:1} + ./samhain_setpwd samhain new %{password} + mv samhain samhain.old + mv samhain.new samhain +%endif +%endif + %install - rm -rf ${RPM_BUILD_ROOT} # sstrip shouldn't be used since binaries will be stripped later @@ -88,4 +98,15 @@ %clean rm -rf ${RPM_BUILD_ROOT} + +%pre +if test "x@install_name@" = "xyule" +then + getent group samhain >/dev/null || groupadd -r samhain + getent passwd yule >/dev/null || \ + useradd -r -g samhain -d @mydataroot@ -s /sbin/nologin \ + -c "samhain server daemon" yule + +fi +exit 0 %post @@ -197,7 +218,14 @@ %attr(644,root,root) @mandir@/man8/@install_name@* %attr(644,root,root) /etc/logrotate.d/@install_name@ +%if "%{name}" == "yule" +%attr(750,root,samhain) @mydataroot@ +%attr(750,yule,samhain) @mylogdir@ +%endif %config(noreplace) @myrpmconffile@ %changelog +* Tue Oct 23 2012 Rainer Wichmann +- fixes for yule installation + * Tue May 16 2006 Rainer Wichmann - fix manual version, noticed by Imre Gergely Index: /trunk/scripts/samhainadmin.pl.in =================================================================== --- /trunk/scripts/samhainadmin.pl.in (revision 414) +++ /trunk/scripts/samhainadmin.pl.in (revision 415) @@ -687,11 +687,13 @@ check_gpg_verify(); my $i = 0; + my $ret = 0; while (defined($ARGV[$i])) { print "\n"; $file1 = $ARGV[$i]; - examine (); + $ret += examine (); ++$i; print "\n--------------------------------\n" if (defined($ARGV[$i])); } + exit($ret); } Index: /trunk/src/samhain.c =================================================================== --- /trunk/src/samhain.c (revision 414) +++ /trunk/src/samhain.c (revision 415) @@ -712,4 +712,5 @@ #if defined(SH_WITH_SERVER) extern int sh_socket_remove (void); + extern int sh_html_zero(); #endif @@ -743,5 +744,9 @@ */ #if defined(SH_WITH_SERVER) - sh_forward_html_write(); + /* zero out the status file at exit, such that the status + * of client becomes unknown in the beltane interface + */ + sh_html_zero(); + /* sh_forward_html_write(); */ #endif @@ -1174,5 +1179,5 @@ FileSchedIn = NULL; *status = 0; - return 0; + return NULL; } @@ -1722,4 +1727,5 @@ (void) sh_files_setrec(); (void) sh_files_test_setup(); + sh_audit_commit (); /* -------- NICE LEVEL --------- @@ -1858,4 +1864,12 @@ (void) sh_files_setrec(); (void) sh_files_test_setup(); + sh_audit_commit (); + + fprintf(stderr, "FIXME: %d\n", (int) sh.fileCheck.alarm_interval); + fprintf(stderr, "FIXME: FileSchedOne %s\n", + FileSchedOne == NULL ? "NULL" : "NOT NULL"); + fprintf(stderr, "FIXME: FileSchedTwo %s\n", + FileSchedTwo == NULL ? "NULL" : "NOT NULL"); + if (0 != sh.flag.nice) Index: /trunk/src/samhain_setpwd.c =================================================================== --- /trunk/src/samhain_setpwd.c (revision 414) +++ /trunk/src/samhain_setpwd.c (revision 415) @@ -279,6 +279,7 @@ if (strlen(argv[3]) != 16) { - fprintf (stdout, _("ERROR %s has not exactly 16 chars\n"), - argv[0]); + fprintf (stdout, + _("ERROR |%s| has not exactly 16 chars\n"), + argv[3]); fflush(stdout); return EXIT_FAILURE; Index: /trunk/src/sh_audit.c =================================================================== --- /trunk/src/sh_audit.c (revision 414) +++ /trunk/src/sh_audit.c (revision 415) @@ -211,7 +211,7 @@ if (p >= 0) { - char command[64]; - - sl_snprintf(command, sizeof(command), _("%s -D -k samhain"), + char ctl[64]; + + sl_snprintf(ctl, sizeof(ctl), _("%s -D -k samhain"), _(actl_paths[p])); sh_error_handle (SH_ERR_ALL, FIL__, __LINE__, @@ -219,10 +219,12 @@ _("Deleting audit daemon rules with key samhain"), _("sh_audit_delete_all") ); - sh_ext_system(command); - } - return; -} - -void sh_audit_mark (const char * file) + + sl_strlcpy(ctl, _(actl_paths[p]), sizeof(ctl)); + sh_ext_system(ctl, ctl, "-D", "-k", _("samhain"), NULL); + } + return; +} + +static void sh_audit_mark_int (const char * file) { static int flushRules = 0; @@ -243,4 +245,5 @@ char * command = SH_ALLOC(len); char * safe; + char ctl[64]; sl_snprintf(command, len, _("%s -w %s -p wa -k samhain"), @@ -255,9 +258,107 @@ SH_FREE(safe); - sh_ext_system(command); - } - return; -} - + sl_strlcpy(ctl, _(actl_paths[p]), sizeof(ctl)); + sl_strlcpy(command, file, len); + + sh_ext_system(ctl, ctl, "-w", command, "-p", "wa", "-k", _("samhain"), NULL); + + SH_FREE(command); + } + return; +} + +struct aud_list { + char * file; + struct aud_list * next; +}; + +struct aud_list * mark_these = NULL; + +static void add_this (char * file) +{ + struct aud_list * this = SH_ALLOC(sizeof(struct aud_list)); + this->file = sh_utils_strdup(file); + this->next = mark_these; + return; +} + +static int test_exchange (struct aud_list * this, char * file) +{ + size_t len0 = sl_strlen(this->file); + size_t len1 = sl_strlen(file); + int ret = -1; + + if (len0 == len1) + { + return strcmp(this->file, file); + } + else + { + char * s0 = SH_ALLOC(len0 + 2); + char * s1 = SH_ALLOC(len1 + 2); + + sl_strlcpy(s0, this->file, len0 + 2); + sl_strlcpy(s1, file, len1 + 2); + + if (s0 < s1) + { + sl_strlcat(s0, "/", len0 + 2); + ret = strncmp(s0, s1, len0 + 1); + } + else + { + sl_strlcat(s1, "/", len1 + 2); + if (0 == strncmp(s0, s1, len1 + 1)) + { + SH_FREE(this->file); + this->file = sh_utils_strdup(file); + ret = 0; + } + } + SH_FREE(s0); + SH_FREE(s1); + } + + return ret; +} + +void sh_audit_mark (char * file) +{ + struct aud_list * all = mark_these; + struct aud_list * this = mark_these; + + if (!mark_these) { + add_this (file); + return; + } + + while (this) + { + if (0 == test_exchange(this, file)) + return; + this = this->next; + } + + add_this (file); + return; +} + +void sh_audit_commit () +{ + struct aud_list * next; + struct aud_list * this = mark_these; + + mark_these = NULL; + + while (this) + { + sh_audit_mark_int (this->file); + next = this->next; + SH_FREE(this->file); + SH_FREE(this); + this = next; + } + +} static int sh_audit_checkdaemon() @@ -381,4 +482,8 @@ return; } +void sh_audit_commit () +{ + return; +} #endif Index: /trunk/src/sh_extern.c =================================================================== --- /trunk/src/sh_extern.c (revision 414) +++ /trunk/src/sh_extern.c (revision 415) @@ -847,8 +847,6 @@ } -int sh_ext_popen_init (sh_tas_t * task, char * command) -{ - int status; - +static void task_init (sh_tas_t * task) +{ sh_ext_tas_init(task); @@ -858,15 +856,45 @@ _("/sbin:/bin:/usr/sbin:/usr/bin:/usr/ucb")); (void) sh_ext_tas_add_envv (task, _("IFS"), " \n\t"); + if (sh.timezone != NULL) { (void) sh_ext_tas_add_envv(task, "TZ", sh.timezone); } + return; +} + +int sh_ext_popen_init (sh_tas_t * task, char * command, char * argv0, ...) +{ + va_list vl; + int status; + + task_init (task); - sh_ext_tas_command(task, _("/bin/sh")); - - (void) sh_ext_tas_add_argv(task, _("/bin/sh")); - (void) sh_ext_tas_add_argv(task, _("-c")); - (void) sh_ext_tas_add_argv(task, command); - + if (!argv0) + { + sh_ext_tas_command(task, _("/bin/sh")); + + (void) sh_ext_tas_add_argv(task, _("/bin/sh")); + (void) sh_ext_tas_add_argv(task, _("-c")); + (void) sh_ext_tas_add_argv(task, command); + } + else + { + char * s; + + sh_ext_tas_command(task, command); + + (void) sh_ext_tas_add_argv(task, argv0); + + va_start (vl, argv0); + s = va_arg (vl, char * ); + while (s != NULL) + { + (void) sh_ext_tas_add_argv(task, s); + s = va_arg (vl, char * ); + } + va_end (vl); + + } task->rw = 'r'; task->fork_twice = S_FALSE; @@ -879,12 +907,32 @@ /* Execute a system command */ -int sh_ext_system (char * command) +int sh_ext_system (char * command, char * argv0, ...) { sh_tas_t task; int status; + va_list vl; + char * s; SL_ENTER(_("sh_ext_system")); - status = sh_ext_popen_init (&task, command); + task_init (&task); + + sh_ext_tas_command(&task, command); + + (void) sh_ext_tas_add_argv(&task, argv0); + + va_start (vl, argv0); + s = va_arg (vl, char * ); + while (s != NULL) + { + (void) sh_ext_tas_add_argv(&task, s); + s = va_arg (vl, char * ); + } + va_end (vl); + + task.rw = 'r'; + task.fork_twice = S_FALSE; + + status = sh_ext_popen(&task); if (status != 0) @@ -915,5 +963,5 @@ SL_ENTER(_("sh_ext_popen_str")); - status = sh_ext_popen_init (&task, command); + status = sh_ext_popen_init (&task, command, NULL, NULL); if (status != 0) Index: /trunk/src/sh_getopt.c =================================================================== --- /trunk/src/sh_getopt.c (revision 414) +++ /trunk/src/sh_getopt.c (revision 415) @@ -401,5 +401,5 @@ printf (_("Client executable (port %d)"), SH_DEFAULT_PORT); ++num; #endif -#if defined(SH_WITH_CLIENT) +#if defined(SH_WITH_SERVER) if (num > 0) fputc ('\n', stdout); printf (_("Server executable (port %d, user %s)"), Index: /trunk/src/sh_html.c =================================================================== --- /trunk/src/sh_html.c (revision 414) +++ /trunk/src/sh_html.c (revision 415) @@ -503,4 +503,30 @@ } +int sh_html_zero() +{ + long fd; + + SL_ENTER(_("sh_html_zero")); + + if (0 != (fd = tf_trust_check (DEFAULT_HTML_FILE, SL_YESPRIV))) + { + SL_RETURN((-1), _("sh_html_zero")); + } + + fd = sl_open_write_trunc (FIL__, __LINE__, DEFAULT_HTML_FILE, SL_YESPRIV); + + if (SL_ISERROR(fd)) + { + SL_RETURN((-1), _("sh_html_zero")); + } + + sh_html_head(fd); + sh_html_foot(fd); + + sl_close(fd); + + SL_RETURN((0), _("sh_html_zero")); +} + /* SH_WITH_SERVER */ #endif Index: /trunk/src/sh_log_check.c =================================================================== --- /trunk/src/sh_log_check.c (revision 414) +++ /trunk/src/sh_log_check.c (revision 415) @@ -915,5 +915,5 @@ entry = SH_ALLOC(sizeof(struct task_entry)); - status = sh_ext_popen_init (&(entry->task), logfile->filename); + status = sh_ext_popen_init (&(entry->task), logfile->filename, logfile->filename, NULL); if (0 == status) { Index: /trunk/src/sh_unix.c =================================================================== --- /trunk/src/sh_unix.c (revision 414) +++ /trunk/src/sh_unix.c (revision 415) @@ -1519,7 +1519,13 @@ #ifdef WITH_ORACLE /* - * Skip the ORACLE_HOME environment variable; Oracle may need it. + * Skip the ORACLE_HOME and TNS_ADMIN environment variables; + * Oracle may need them. */ if (0 == sl_strncmp((*env), _("ORACLE_HOME="), 12)) + { + ++(env); + continue; + } + if (0 == sl_strncmp((*env), _("TNS_ADMIN="), 10)) { ++(env); Index: /trunk/test/testrun_2.sh =================================================================== --- /trunk/test/testrun_2.sh (revision 414) +++ /trunk/test/testrun_2.sh (revision 415) @@ -537,4 +537,6 @@ fi + cp $HTML ${HTML}.tmp + kill $PROC_Y five_sec_sleep @@ -568,10 +570,10 @@ fi - egrep '' $HTML >/dev/null 2>&1 + egrep '' ${HTML}.tmp >/dev/null 2>&1 if [ $? -ne 0 ]; then [ -z "$verbose" ] || log_msg_fail "head.html"; return 1 fi - egrep '' $HTML >/dev/null 2>&1 + egrep '' ${HTML}.tmp >/dev/null 2>&1 if [ $? -ne 0 ]; then [ -z "$verbose" ] || log_msg_fail "end head.html"; @@ -579,10 +581,10 @@ fi - egrep '' $HTML >/dev/null 2>&1 + egrep '' ${HTML}.tmp >/dev/null 2>&1 if [ $? -ne 0 ]; then [ -z "$verbose" ] || log_msg_fail "entry.html"; return 1 fi - egrep '' $HTML >/dev/null 2>&1 + egrep '' ${HTML}.tmp >/dev/null 2>&1 if [ $? -ne 0 ]; then [ -z "$verbose" ] || log_msg_fail "end entry.html"; @@ -590,10 +592,10 @@ fi - egrep '' $HTML >/dev/null 2>&1 + egrep '' ${HTML}.tmp >/dev/null 2>&1 if [ $? -ne 0 ]; then [ -z "$verbose" ] || log_msg_fail "foot.html"; return 1 fi - egrep '' $HTML >/dev/null 2>&1 + egrep '' ${HTML}.tmp >/dev/null 2>&1 if [ $? -ne 0 ]; then [ -z "$verbose" ] || log_msg_fail "end foot.html"; @@ -609,4 +611,6 @@ fi; } + + rm ${HTML}.tmp return 0 Index: /trunk/yulerc.template =================================================================== --- /trunk/yulerc.template (revision 414) +++ /trunk/yulerc.template (revision 415) @@ -47,13 +47,12 @@ ## # MailSeverity=none -MailSeverity=crit ## Console ## -# PrintSeverity=info +PrintSeverity=none ## Logfile ## -# LogSeverity=none +LogSeverity = warn ## Syslog @@ -97,9 +96,9 @@ ## Log the server timestamp for received messages # -SetDBServerTstamp = True +# SetDBServerTstamp = True ## Use a persistent connection # -UsePersistent = True +# UsePersistent = True