webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into core82

Browse Source
This commit is contained in:
Arne Fitzenreiter
2014-09-09 17:57:27 +02:00
parent d18925c39a 51d8e33093
commit 7b0afb50d3
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/cfgroot/general-functions.pl
View File

@@ -286,7 +286,7 @@ sub validip
sub validmask { sub validmask {
my $mask = shift; my $mask = shift;
return &Network::check_netmask($mask) or &Network::check_prefix($mask); return &Network::check_netmask($mask) || &Network::check_prefix($mask);
} }
sub validipormask sub validipormask
@@ -388,7 +388,9 @@ sub iporsubtocidr
} }
sub getnetworkip { sub getnetworkip {
return &Network::get_netaddress(shift); my $arg = join("/", @_);
return &Network::get_netaddress($arg);
} }
sub getccdbc sub getccdbc

3
config/xen-image/README
View File

@@ -19,6 +19,7 @@ other usefull commands from the Dom0:
- reset the fire: "xm destroy ipfire-xen" - reset the fire: "xm destroy ipfire-xen"
- look what is going on: "xm top" or "xm list" - look what is going on: "xm top" or "xm list"
This script can also build a Citrix XenCenter xva image. This script can also build a Citrix XenCenter xva image. (Need xz-aware
xen version. Tested with Citrix Xen Server 6.2.5 beta)
- run "XEN_IMG_TYPE=xva sh xen-image-maker.sh" to build an xva image. - run "XEN_IMG_TYPE=xva sh xen-image-maker.sh" to build an xva image.
- import the vm with "xe vm-import file=ipfire.xfa" - import the vm with "xe vm-import file=ipfire.xfa"

6
lfs/rsync
View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 3.1.0 VER = 3.1.1
THISAPP = rsync-$(VER) THISAPP = rsync-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
PROG = rsync PROG = rsync
PAK_VER = 8 PAK_VER = 9
DEPS = "" DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 3be148772a33224771a8d4d2a028b132 $(DL_FILE)_MD5 = 43bd6676f0b404326eee2d63be3cdcfe
install : $(TARGET) install : $(TARGET)

1
src/squid-accounting/acct-lib.pl
View File

@@ -460,7 +460,6 @@ sub pdf2 {
$lines->linewidth('0.5'); $lines->linewidth('0.5');
#Fill BILL DATA into PDF #Fill BILL DATA into PDF
setlocale(LC_ALL, "$mainsettings{'LANGUAGE'}_$uplang");
foreach (@billar) { foreach (@billar) {
my ($a1,$a2) = split( /\,/, $_ ); my ($a1,$a2) = split( /\,/, $_ );
$a2=sprintf"%.2f",($a2/1024/1024); $a2=sprintf"%.2f",($a2/1024/1024);