From 42036e42ee291404c96db59f07e667e0d6688a75 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 24 May 2013 16:26:57 +0200 Subject: [PATCH] Fix openvpn-routed-delete-net script and remove copyright notice --- .../events/actions/openvpn-routed-delete-net | 24 ++-------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/root/etc/e-smith/events/actions/openvpn-routed-delete-net b/root/etc/e-smith/events/actions/openvpn-routed-delete-net index 778b7f3..8f5ef32 100644 --- a/root/etc/e-smith/events/actions/openvpn-routed-delete-net +++ b/root/etc/e-smith/events/actions/openvpn-routed-delete-net @@ -1,24 +1,4 @@ #!/usr/bin/perl -w - -#---------------------------------------------------------------------- -# copyright (C) 2013 Firewall Services -# Daniel Berteaud -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -#---------------------------------------------------------------------- - use strict; use esmith::ConfigDB; use esmith::NetworksDB; @@ -27,7 +7,8 @@ use esmith::event; my $c = esmith::ConfigDB->open_ro || die "Couldn't open config db\n"; my $n = esmith::NetworksDB->open || die "Couldn't open netwoks db\n"; my @nets = $n->networks; -my $net = ${'openvpn-routed'}{Network} || '192.168.29.0/255.255.255.0'; +my $ovpn = $c->get('openvpn-routed'); +my $net = $ovpn->prop('Network') || '192.168.29.0/255.255.255.0'; my ($vpnnet,$mask) = split /\//, $net; foreach my $net (@nets){ @@ -42,4 +23,3 @@ foreach my $net (@nets){ } } } -