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, next has been updated via f99f4293e7ccb913105be165ddf25ea90bf676d4 (commit) via 2444cc97804bbb9874fd2145f596c9d92d540b81 (commit) via 9d85ac3b9362cd97ece5303dea1f95052626848a (commit) from 5520be2f215bcf904d413a77242a0209829ada36 (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 f99f4293e7ccb913105be165ddf25ea90bf676d4 Merge: 2444cc9 5520be2 Author: Christian Schmidt maniacikarus@ipfire.org Date: Mon Aug 1 19:08:35 2011 +0200

Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next

Conflicts: html/cgi-bin/vpnmain.cgi

commit 2444cc97804bbb9874fd2145f596c9d92d540b81 Author: Christian Schmidt maniacikarus@ipfire.org Date: Mon Aug 1 19:07:00 2011 +0200

VPN RW IP can be empty.

commit 9d85ac3b9362cd97ece5303dea1f95052626848a Author: Christian Schmidt maniacikarus@ipfire.org Date: Mon Aug 1 18:58:54 2011 +0200

Added Roadwarrior Network to the ipsec gui.

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

Summary of changes: html/cgi-bin/vpnmain.cgi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

Difference in files: diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 28fcdac..888372e 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -475,7 +475,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg goto SAVE_ERROR; }

- if ( !&General::validipandmask($cgiparams{'RW_NET'}) ) { + if ( $cgiparams{'RW_NET'} ne '' and !&General::validipandmask($cgiparams{'RW_NET'}) ) { $errormessage = $Lang::tr{'urlfilter invalid ip or mask error'}; goto SAVE_ERROR; }

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