[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8e6a8fd5d3b36919ff427abcdd0e7072fc7f85d9

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8e6a8fd5d3b36919ff427abcdd0e7072fc7f85d9

[git]

[-- Attachment #1: Type: text/plain, Size: 2417 bytes --]

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  8e6a8fd5d3b36919ff427abcdd0e7072fc7f85d9 (commit)
      from  86228a56efb74663eb3545d4e75ec59c5a2a8b1e (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 8e6a8fd5d3b36919ff427abcdd0e7072fc7f85d9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Aug 19 17:40:57 2013 +0200

    ovpnmain.cgi: Don't fail if files are not existant.
    
    N2N connections could not be deleted if they have never been
    started.

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

Summary of changes:
 html/cgi-bin/ovpnmain.cgi | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index e6ea1ef..73e610b 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2195,14 +2195,15 @@ else
 # m.a.d net2net
 ###
 
- if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
-
+if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
 	my $conffile = glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]/$confighash{$cgiparams{'KEY'}}[1].conf");
-  my $certfile = glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12");
-  unlink ($certfile) or die "Removing $certfile fail: $!";
-  unlink ($conffile) or die "Removing $conffile fail: $!";
-  rmdir ("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") || die "Kann Verzeichnis nicht loeschen: $!";
-  
+	my $certfile = glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12");
+	unlink ($certfile);
+	unlink ($conffile);
+
+	if (-e "${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") {
+		rmdir ("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") || die "Kann Verzeichnis nicht loeschen: $!";
+	}
 }
 
   unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem");


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