This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 42d9192e0cc8f7544016af09c2277853fc3d884c (commit) from c2cc3cf1b990cb84e0bc15ae1fd45d4786b0b6da (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 42d9192e0cc8f7544016af09c2277853fc3d884c Author: Christian Schmidt maniacikarus@ipfire.org Date: Sun Jan 9 13:08:50 2011 +0100

Fixed snort display bugs, 0000745, 0000751.

-----------------------------------------------------------------------

Summary of changes: html/cgi-bin/ids.cgi | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)

Difference in files: diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index a4faf8d..8c219ae 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -278,7 +278,8 @@ if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} e { $errormessage = $Lang::tr{'invalid input for oink code'} unless ( ($snortsettings{'OINKCODE'} =~ /^[a-z0-9]+$/) || - ($snortsettings{'RULESTYPE'} eq 'nothing' ) ); + ($snortsettings{'RULESTYPE'} eq 'nothing' ) || + ($snortsettings{'RULESTYPE'} eq 'community' ));

&General::writehash("${General::swroot}/snort/settings", %snortsettings); if ($snortsettings{'ENABLE_SNORT'} eq 'on') @@ -537,10 +538,8 @@ print <<END <td width='30%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'download new ruleset'}' /> END ; - -if ( $snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'} ) { - $snortsettings{'INSTALLDATE'} = `/bin/date +'%Y-%m-%d'`; - &General::writehash("${General::swroot}/snort/settings", %snortsettings); +if ( -e "/var/tmp/snortrules.tar.gz"){ + $snortsettings{'INSTALLDATE'} = `ls -la /var/tmp/snortrules.tar.gz | cut -d" " -f6-8`; } print "&nbsp;$Lang::tr{'updates installed'}: $snortsettings{'INSTALLDATE'}</td>";

hooks/post-receive -- IPFire 2.x development tree