Revision: 2779
http://ipcop.svn.sourceforge.net/ipcop/?rev=2779&view=rev
Author: riddles
Date: 2009-05-04 12:22:07 +0000 (Mon, 04 May 2009)
Log Message:
-----------
Merged /ipcop/trunk:r2770-2778
Modified Paths:
--------------
ipcop/branches/template-branch/config/kernel/kernel.config.i486
ipcop/branches/template-branch/config/kernel/kernel.config.ppc
ipcop/branches/template-branch/config/kernel/kernel.config.sparc
ipcop/branches/template-branch/html/cgi-bin/dhcp.cgi
ipcop/branches/template-branch/html/cgi-bin/ovpnmain.cgi
ipcop/branches/template-branch/langs/ipcop.new.en.pl
ipcop/branches/template-branch/lfs/ipcop
ipcop/branches/template-branch/lfs/linux
ipcop/branches/template-branch/src/installer/installer.c
Property Changed:
----------------
ipcop/branches/template-branch/
ipcop/branches/template-branch/config/rootfiles/arch_i486/mtools
Property changes on: ipcop/branches/template-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /ipcop/trunk:2760-2769
+ /ipcop/trunk:2760-2778
Modified: ipcop/branches/template-branch/config/kernel/kernel.config.i486
===================================================================
--- ipcop/branches/template-branch/config/kernel/kernel.config.i486
2009-05-03 20:40:52 UTC (rev 2778)
+++ ipcop/branches/template-branch/config/kernel/kernel.config.i486
2009-05-04 12:22:07 UTC (rev 2779)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27
-# Fri Apr 24 23:40:54 2009
+# Fri May 1 07:13:33 2009
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -509,6 +509,7 @@
# CONFIG_TCP_MD5SIG is not set
# CONFIG_IP_VS is not set
# CONFIG_IPV6 is not set
+# CONFIG_NETLABEL is not set
# CONFIG_NETWORK_SECMARK is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
@@ -618,6 +619,7 @@
CONFIG_IP_NF_TARGET_TTL=m
# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
CONFIG_IP_NF_RAW=m
+# CONFIG_IP_NF_SECURITY is not set
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
@@ -2367,7 +2369,7 @@
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_STRICT_DEVMEM is not set
+CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y
# CONFIG_4KSTACKS is not set
@@ -2387,8 +2389,10 @@
# Security options
#
# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
+CONFIG_SECURITY=y
+# CONFIG_SECURITY_NETWORK is not set
# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_CRYPTO=y
#
Modified: ipcop/branches/template-branch/config/kernel/kernel.config.ppc
===================================================================
--- ipcop/branches/template-branch/config/kernel/kernel.config.ppc
2009-05-03 20:40:52 UTC (rev 2778)
+++ ipcop/branches/template-branch/config/kernel/kernel.config.ppc
2009-05-04 12:22:07 UTC (rev 2779)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27
-# Fri Apr 24 23:45:10 2009
+# Fri May 1 07:29:52 2009
#
# CONFIG_PPC64 is not set
@@ -364,6 +364,7 @@
# CONFIG_TCP_MD5SIG is not set
# CONFIG_IP_VS is not set
# CONFIG_IPV6 is not set
+# CONFIG_NETLABEL is not set
# CONFIG_NETWORK_SECMARK is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
@@ -473,6 +474,7 @@
CONFIG_IP_NF_TARGET_TTL=m
# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
CONFIG_IP_NF_RAW=m
+# CONFIG_IP_NF_SECURITY is not set
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
@@ -2203,8 +2205,10 @@
# Security options
#
# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
+CONFIG_SECURITY=y
+# CONFIG_SECURITY_NETWORK is not set
# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_CRYPTO=y
#
Modified: ipcop/branches/template-branch/config/kernel/kernel.config.sparc
===================================================================
--- ipcop/branches/template-branch/config/kernel/kernel.config.sparc
2009-05-03 20:40:52 UTC (rev 2778)
+++ ipcop/branches/template-branch/config/kernel/kernel.config.sparc
2009-05-04 12:22:07 UTC (rev 2779)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.21
-# Sat Apr 25 01:38:27 2009
+# Linux kernel version: 2.6.27
+# Fri May 1 07:33:41 2009
#
CONFIG_SPARC=y
CONFIG_SPARC64=y
@@ -267,6 +267,7 @@
# CONFIG_TCP_MD5SIG is not set
# CONFIG_IP_VS is not set
# CONFIG_IPV6 is not set
+# CONFIG_NETLABEL is not set
# CONFIG_NETWORK_SECMARK is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
@@ -376,6 +377,7 @@
CONFIG_IP_NF_TARGET_TTL=m
# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
CONFIG_IP_NF_RAW=m
+# CONFIG_IP_NF_SECURITY is not set
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
@@ -1966,8 +1968,10 @@
# Security options
#
# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
+CONFIG_SECURITY=y
+# CONFIG_SECURITY_NETWORK is not set
# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_CRYPTO=y
#
Property changes on:
ipcop/branches/template-branch/config/rootfiles/arch_i486/mtools
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /ipcop/trunk/config/rootfiles/arch_i486/mtools:2760-2778
Modified: ipcop/branches/template-branch/html/cgi-bin/dhcp.cgi
===================================================================
--- ipcop/branches/template-branch/html/cgi-bin/dhcp.cgi 2009-05-03
20:40:52 UTC (rev 2778)
+++ ipcop/branches/template-branch/html/cgi-bin/dhcp.cgi 2009-05-04
12:22:07 UTC (rev 2779)
@@ -16,7 +16,7 @@
# along with IPCop; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# (c) 2001-2008 The IPCop Team
+# (c) 2001-2009 The IPCop Team
#
# Over the years many people have changed and contributed to this file.
# Check CVS and SVN for specifics.
@@ -342,6 +342,28 @@
goto ERROR_SAVE_FIXED;
}
+ my $insubnet = 0;
+ # IP must be in green or blue network and dnsmasq must be active there
+ foreach $interface (@INTERFACEs) {
+ for ($counter = 1; $counter <= $netsettings{"${interface}_COUNT"};
$counter++) {
+ next if ($dhcpsettings{"ENABLED_${interface}_${counter}"} ne 'on');
+
+ if (&General::IpInSubnet($dhcpsettings{'FIXED_IP'},
+
$netsettings{"${interface}_${counter}_NETADDRESS"},
+
$netsettings{"${interface}_${counter}_NETMASK"})
+ ) {
+ $insubnet++;
+ }
+ }
+ }
+ if ($insubnet == 0) {
+ $errormessage = $Lang::tr{'invalid fixed ip address'};
+ goto ERROR_SAVE_FIXED;
+ }
+
+ # TODO: test for duplicate MAC addresses
+ # Duplicate MAC is OK, as long as the to be assigned IP addresses are in
different networks
+
if ($dhcpsettings{'KEY_FIXED'} ne '') {
# replace existing
@@ -829,10 +851,11 @@
elsif ($dhcpsettings{'SORT_FIXEDLEASELIST'} eq 'FIXEDMACRev') {
system "/usr/bin/sort -r -t ',' -k 1,1 /var/ipcop/dhcp/fixedleases -o
/var/ipcop/dhcp/fixedleases";
}
- elsif ($dhcpsettings{'SORT_FIXEDLEASELIST'} eq 'FIXEDIP') {
+ elsif ($dhcpsettings{'SORT_FIXEDLEASELIST'} eq 'FIXEDIPRev') {
system "/usr/bin/sort -r -n -t ',' -k 2,2 /var/ipcop/dhcp/fixedleases
-o /var/ipcop/dhcp/fixedleases";
}
- elsif ($dhcpsettings{'SORT_FIXEDLEASELIST'} eq 'FIXEDIPRev') {
+ else {
+ # FIXEDIP is also default when no sorting selected (yet)
system "/usr/bin/sort -n -t ',' -k 2,2 /var/ipcop/dhcp/fixedleases -o
/var/ipcop/dhcp/fixedleases";
}
Modified: ipcop/branches/template-branch/html/cgi-bin/ovpnmain.cgi
===================================================================
--- ipcop/branches/template-branch/html/cgi-bin/ovpnmain.cgi 2009-05-03
20:40:52 UTC (rev 2778)
+++ ipcop/branches/template-branch/html/cgi-bin/ovpnmain.cgi 2009-05-04
12:22:07 UTC (rev 2779)
@@ -59,8 +59,12 @@
$cgiparams{'ACTION'} = '';
$cgiparams{'CA_NAME'} = '';
$cgiparams{'DHCP_DOMAIN'} = '';
-$cgiparams{'DHCP_DNS'} = '';
-$cgiparams{'DHCP_WINS'} = '';
+$cgiparams{'DHCP_DNS1'} = '';
+$cgiparams{'DHCP_DNS2'} = '';
+$cgiparams{'DHCP_NTP1'} = '';
+$cgiparams{'DHCP_NTP2'} = '';
+$cgiparams{'DHCP_WINS1'} = '';
+$cgiparams{'DHCP_WINS2'} = '';
$cgiparams{'NOBIND'} = 'off';
$cgiparams{'DCOMPLZO'} = 'off';
$cgiparams{'ACTION'} = '';
@@ -145,6 +149,7 @@
if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) {
print CONF "keepalive $sovpnsettings{'KEEPALIVE_1'}
$sovpnsettings{'KEEPALIVE_2'}\n";
}
+ print CONF "client-config-dir /var/ipcop/ovpn/ccd\n";
print CONF "status-version 1\n";
print CONF "status /var/log/ovpnserver.log 30\n";
print CONF "cipher $sovpnsettings{DCIPHER}\n";
@@ -157,20 +162,29 @@
if ($sovpnsettings{DHCP_DOMAIN} ne '') {
print CONF "push \"dhcp-option DOMAIN $sovpnsettings{DHCP_DOMAIN}\"\n";
}
-
- if ($sovpnsettings{DHCP_DNS} ne '') {
- print CONF "push \"dhcp-option DNS $sovpnsettings{DHCP_DNS}\"\n";
+ if ($sovpnsettings{DHCP_DNS1} ne '') {
+ print CONF "push \"dhcp-option DNS $sovpnsettings{DHCP_DNS1}\"\n";
}
-
- if ($sovpnsettings{DHCP_WINS} ne '') {
- print CONF "push \"dhcp-option WINS $sovpnsettings{DHCP_WINS}\"\n";
+ if ($sovpnsettings{DHCP_DNS2} ne '') {
+ print CONF "push \"dhcp-option DNS $sovpnsettings{DHCP_DNS2}\"\n";
}
+ if ($sovpnsettings{DHCP_NTP1} ne '') {
+ print CONF "push \"dhcp-option NTP $sovpnsettings{DHCP_NTP1}\"\n";
+ }
+ if ($sovpnsettings{DHCP_NTP2} ne '') {
+ print CONF "push \"dhcp-option NTP $sovpnsettings{DHCP_NTP2}\"\n";
+ }
+ if ($sovpnsettings{DHCP_WINS1} ne '') {
+ print CONF "push \"dhcp-option WINS $sovpnsettings{DHCP_WINS1}\"\n";
+ }
+ if ($sovpnsettings{DHCP_WINS2} ne '') {
+ print CONF "push \"dhcp-option WINS $sovpnsettings{DHCP_WINS2}\"\n";
+ }
- if ($sovpnsettings{DHCP_WINS} eq '') {
+ if ($sovpnsettings{MAX_CLIENTS} eq '') {
print CONF "max-clients 100\n";
}
-
- if ($sovpnsettings{DHCP_WINS} ne '') {
+ else {
print CONF "max-clients $sovpnsettings{MAX_CLIENTS}\n";
}
print CONF "tls-verify /usr/local/bin/openvpnverify\n";
@@ -273,8 +287,12 @@
$vpnsettings{'REDIRECT_GW_DEF1'} = $cgiparams{'REDIRECT_GW_DEF1'};
$vpnsettings{'CLIENT2CLIENT'} = $cgiparams{'CLIENT2CLIENT'};
$vpnsettings{'DHCP_DOMAIN'} = $cgiparams{'DHCP_DOMAIN'};
- $vpnsettings{'DHCP_DNS'} = $cgiparams{'DHCP_DNS'};
- $vpnsettings{'DHCP_WINS'} = $cgiparams{'DHCP_WINS'};
+ $vpnsettings{'DHCP_DNS1'} = $cgiparams{'DHCP_DNS1'};
+ $vpnsettings{'DHCP_DNS2'} = $cgiparams{'DHCP_DNS2'};
+ $vpnsettings{'DHCP_NTP1'} = $cgiparams{'DHCP_NTP1'};
+ $vpnsettings{'DHCP_NTP2'} = $cgiparams{'DHCP_NTP2'};
+ $vpnsettings{'DHCP_WINS1'} = $cgiparams{'DHCP_WINS1'};
+ $vpnsettings{'DHCP_WINS2'} = $cgiparams{'DHCP_WINS2'};
$vpnsettings{'NOBIND'} = $cgiparams{'NOBIND'};
$vpnsettings{'RADIUS_ENABLED'} = $cgiparams{'RADIUS_ENABLED'};
@@ -286,23 +304,59 @@
$vpnsettings{'RADIUS_PASS1'} = $cgiparams{'RADIUS_PASS1'};
if ($cgiparams{'DHCP_DOMAIN'} ne '') {
- unless (&General::validfqdn($cgiparams{'DHCP_DOMAIN'}) ||
&General::validip($cgiparams{'DHCP_DOMAIN'})) {
+ unless (&General::validdomainname($cgiparams{'DHCP_DOMAIN'})) {
$errormessage = $Lang::tr{'invalid input for dhcp domain'};
goto ADV_ERROR;
}
}
- if ($cgiparams{'DHCP_DNS'} ne '') {
- unless (&General::validfqdn($cgiparams{'DHCP_DNS'}) ||
&General::validip($cgiparams{'DHCP_DNS'})) {
- $errormessage = $Lang::tr{'invalid input for dhcp dns'};
+ if ($cgiparams{'DHCP_DNS1'} ne '') {
+ unless (&General::validip($cgiparams{'DHCP_DNS1'})) {
+ $errormessage = $Lang::tr{'invalid primary dns'};
goto ADV_ERROR;
}
}
- if ($cgiparams{'DHCP_WINS'} ne '') {
- unless (&General::validfqdn($cgiparams{'DHCP_WINS'}) ||
&General::validip($cgiparams{'DHCP_WINS'})) {
- $errormessage = $Lang::tr{'invalid input for dhcp wins'};
+ if ($cgiparams{'DHCP_DNS2'} ne '') {
+ unless (&General::validip($cgiparams{'DHCP_DNS2'})) {
+ $errormessage = $Lang::tr{'invalid secondary dns'};
goto ADV_ERROR;
}
+ if ($cgiparams{'DHCP_DNS1'} eq '') {
+ $errormessage = $Lang::tr{'cannot specify secondary dns without
specifying primary'};
+ goto ADV_ERROR;
+ }
}
+ if ($cgiparams{'DHCP_NTP1'} ne '') {
+ unless (&General::validip($cgiparams{'DHCP_NTP1'})) {
+ $errormessage = $Lang::tr{'invalid primary ntp'};
+ goto ADV_ERROR;
+ }
+ }
+ if ($cgiparams{'DHCP_NTP2'} ne '') {
+ unless (&General::validip($cgiparams{'DHCP_NTP2'})) {
+ $errormessage = $Lang::tr{'invalid secondary ntp'};
+ goto ADV_ERROR;
+ }
+ if ($cgiparams{'DHCP_NTP1'} eq '') {
+ $errormessage = $Lang::tr{'cannot specify secondary ntp without
specifying primary'};
+ goto ADV_ERROR;
+ }
+ }
+ if ($cgiparams{'DHCP_WINS1'} ne '') {
+ unless (&General::validip($cgiparams{'DHCP_WINS1'})) {
+ $errormessage = $Lang::tr{'invalid wins address'};
+ goto ADV_ERROR;
+ }
+ }
+ if ($cgiparams{'DHCP_WINS2'} ne '') {
+ unless (&General::validip($cgiparams{'DHCP_WINS2'})) {
+ $errormessage = $Lang::tr{'invalid wins address'};
+ goto ADV_ERROR;
+ }
+ if ($cgiparams{'DHCP_WINS1'} eq '') {
+ $errormessage = $Lang::tr{'cannot specify secondary wins without
specifying primary'};
+ goto ADV_ERROR;
+ }
+ }
if ((length($cgiparams{'MAX_CLIENTS'}) == 0) ||
(($cgiparams{'MAX_CLIENTS'}) < 1 ) || (($cgiparams{'MAX_CLIENTS'}) > 255 )) {
$errormessage = $Lang::tr{'invalid input for max clients'};
goto ADV_ERROR;
@@ -695,9 +749,9 @@
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'ovpn configuration main'}, 1, '');
- &Header::openbigbox('100%', 'left', '', $errormessage);
+ &Header::openbigbox('100%', 'left', '');
if ($errormessage) {
- &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:");
+ &Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:",
'error');
print "<font class='base'>$errormessage </font>";
&Header::closebox();
}
@@ -706,42 +760,52 @@
<form method='post' enctype='multipart/form-data' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%'>
<tr>
- <td class='boldbase' colspan='2'>$Lang::tr{'dhcp-options'}</td>
+ <td class='boldbase' colspan='4'>$Lang::tr{'dhcp-options'}</td>
</tr><tr>
- <td width='40%' class='base'>$Lang::tr{'domain name suffix'}: <img
src='/blob.gif' alt='*' /></td>
- <td width='60%'><input type='text' name='DHCP_DOMAIN'
value='$cgiparams{'DHCP_DOMAIN'}' size='30' /></td>
+ <td width='25%' class='base'>$Lang::tr{'domain name suffix'}: <img
src='/blob.gif' alt='*' /></td>
+ <td colspan='3'><input type='text' name='DHCP_DOMAIN'
value='$cgiparams{'DHCP_DOMAIN'}' size='30' /></td>
</tr><tr>
- <td class='base'>$Lang::tr{'primary dns'}: <img src='/blob.gif'
alt='*' /></td>
- <td><input type='text' name='DHCP_DNS' value='$cgiparams{'DHCP_DNS'}'
size='30' /></td>
+ <td width='25%' class='base'>$Lang::tr{'primary dns'}: <img
src='/blob.gif' alt='*' /></td>
+ <td width='25%'><input type='text' name='DHCP_DNS1'
value='$cgiparams{'DHCP_DNS1'}' /></td>
+ <td width='25%' class='base'>$Lang::tr{'secondary dns'}: <img
src='/blob.gif' alt='*' /></td>
+ <td width='25%'><input type='text' name='DHCP_DNS2'
value='$cgiparams{'DHCP_DNS2'}' /></td>
</tr><tr>
+ <td class='base'>$Lang::tr{'primary ntp server'}: <img
src='/blob.gif' alt='*' /></td>
+ <td><input type='text' name='DHCP_NTP1' value='$cgiparams{'DHCP_NTP1'}'
/></td>
+ <td class='base'>$Lang::tr{'secondary ntp server'}: <img
src='/blob.gif' alt='*' /></td>
+ <td><input type='text' name='DHCP_NTP2' value='$cgiparams{'DHCP_NTP2'}'
/></td>
+</tr><tr>
<td class='base'>$Lang::tr{'primary wins server address'}: <img
src='/blob.gif' alt='*' /></td>
- <td><input type='text' name='DHCP_WINS' value='$cgiparams{'DHCP_WINS'}'
size='30' /></td>
+ <td><input type='text' name='DHCP_WINS1' value='$cgiparams{'DHCP_WINS1'}'
/></td>
+ <td class='base'>$Lang::tr{'secondary wins server address'}: <img
src='/blob.gif' alt='*' /></td>
+ <td><input type='text' name='DHCP_WINS2' value='$cgiparams{'DHCP_WINS2'}'
/></td>
</tr><tr>
- <td colspan='2'><hr /></td>
+ <td colspan='4'><hr /></td>
</tr><tr>
- <td class='boldbase' colspan='2'>$Lang::tr{'misc-options'}</td>
+ <td class='boldbase' colspan='4'>$Lang::tr{'misc-options'}</td>
</tr><tr>
<td class='base'>Client-To-Client:</td>
- <td><input type='checkbox' name='CLIENT2CLIENT'
$checked{'CLIENT2CLIENT'}{'on'} /></td>
+ <td colspan='3'><input type='checkbox' name='CLIENT2CLIENT'
$checked{'CLIENT2CLIENT'}{'on'} /></td>
</tr><tr>
<td class='base'>Redirect-Gateway def1:</td>
- <td><input type='checkbox' name='REDIRECT_GW_DEF1'
$checked{'REDIRECT_GW_DEF1'}{'on'} /></td>
+ <td colspan='3'><input type='checkbox' name='REDIRECT_GW_DEF1'
$checked{'REDIRECT_GW_DEF1'}{'on'} /></td>
</tr><tr>
<td class='base'>Nobind:</td>
- <td><input type='checkbox' name='NOBIND' $checked{'NOBIND'}{'on'} /></td>
+ <td colspan='3'><input type='checkbox' name='NOBIND'
$checked{'NOBIND'}{'on'} /></td>
</tr><tr>
<td class='base'>Max-Clients:</td>
- <td><input type='text' name='MAX_CLIENTS'
value='$cgiparams{'MAX_CLIENTS'}' size='10' /></td>
+ <td colspan='3'><input type='text' name='MAX_CLIENTS'
value='$cgiparams{'MAX_CLIENTS'}' size='10' /></td>
</tr><tr>
<td class='base'>Keepalive (ping/ping-restart):</td>
- <td><input type='text' name='KEEPALIVE_1'
value='$cgiparams{'KEEPALIVE_1'}' size='10' />
+ <td colspan='3'><input type='text' name='KEEPALIVE_1'
value='$cgiparams{'KEEPALIVE_1'}' size='10' />
<input type='text' name='KEEPALIVE_2'
value='$cgiparams{'KEEPALIVE_2'}' size='10' /></td>
</tr><tr>
- <td colspan='2'><hr /></td>
+ <td colspan='4'><hr /></td>
</tr><tr>
- <td class='boldbase'>$Lang::tr{'log-options'}</td>
-</tr><tr><td class='base'>VERB</td>
- <td><select name='LOG_VERB'>
+ <td class='boldbase' colspan='4'>$Lang::tr{'log-options'}</td>
+</tr><tr>
+ <td class='base'>VERB</td>
+ <td colspan='3'><select name='LOG_VERB'>
<option value='1' $selected{'LOG_VERB'}{'1'}>1</option>
<option value='2' $selected{'LOG_VERB'}{'2'}>2</option>
<option value='3' $selected{'LOG_VERB'}{'3'}>3</option>
@@ -756,30 +820,30 @@
<option value='0' $selected{'LOG_VERB'}{'0'}>0</option></select>
</td>
</tr><tr>
- <td colspan='2'><hr /></td>
+ <td colspan='4'><hr /></td>
</tr><tr>
- <td class='boldbase' colspan='2'>$Lang::tr{'radius server settings'}</td>
+ <td class='boldbase' colspan='4'>$Lang::tr{'radius server settings'}</td>
</tr><tr>
<td class='base'>$Lang::tr{'radius enable'}:</td>
- <td><input type='checkbox' name='RADIUS_ENABLED'
$checked{'RADIUS_ENABLED'}{'on'} /></td>
+ <td colspan='3'><input type='checkbox' name='RADIUS_ENABLED'
$checked{'RADIUS_ENABLED'}{'on'} /></td>
</tr><tr>
<td class='base'>$Lang::tr{'radius servername'}:</td>
- <td><input type='text' name='RADIUS_HOST'
value='$cgiparams{'RADIUS_HOST'}' size='30' /></td>
+ <td colspan='3'><input type='text' name='RADIUS_HOST'
value='$cgiparams{'RADIUS_HOST'}' size='30' /></td>
</tr><tr>
<td class='base'>$Lang::tr{'radius authport'}:</td>
- <td><input type='text' name='RADIUS_AUTHPORT'
value='$cgiparams{'RADIUS_AUTHPORT'}' size='10' /></td>
+ <td colspan='3'><input type='text' name='RADIUS_AUTHPORT'
value='$cgiparams{'RADIUS_AUTHPORT'}' size='10' /></td>
</tr><tr>
<td class='base'>$Lang::tr{'radius acctport'}:</td>
- <td><input type='text' name='RADIUS_ACCTPORT'
value='$cgiparams{'RADIUS_ACCTPORT'}' size='10' /></td>
+ <td colspan='3'><input type='text' name='RADIUS_ACCTPORT'
value='$cgiparams{'RADIUS_ACCTPORT'}' size='10' /></td>
</tr><tr>
<td class='base'>$Lang::tr{'maximum retries'}:</td>
- <td><input type='text' name='RADIUS_RETRY'
value='$cgiparams{'RADIUS_RETRY'}' size='10' /></td>
+ <td colspan='3'><input type='text' name='RADIUS_RETRY'
value='$cgiparams{'RADIUS_RETRY'}' size='10' /></td>
</tr><tr>
<td class='base'>$Lang::tr{'radius wait'}:</td>
- <td><input type='text' name='RADIUS_TIMEOUT'
value='$cgiparams{'RADIUS_TIMEOUT'}' size='10' /></td>
+ <td colspan='3'><input type='text' name='RADIUS_TIMEOUT'
value='$cgiparams{'RADIUS_TIMEOUT'}' size='10' /></td>
</tr><tr>
<td class='base'>$Lang::tr{'radius sharedsecret'}:</td>
- <td><input type='password' name='RADIUS_PASS1'
value='$cgiparams{'RADIUS_PASS1'}' size='32' /></td>
+ <td colspan='3'><input type='password' name='RADIUS_PASS1'
value='$cgiparams{'RADIUS_PASS1'}' size='32' /></td>
</tr>
</table>
<hr />
Modified: ipcop/branches/template-branch/langs/ipcop.new.en.pl
===================================================================
--- ipcop/branches/template-branch/langs/ipcop.new.en.pl 2009-05-03
20:40:52 UTC (rev 2778)
+++ ipcop/branches/template-branch/langs/ipcop.new.en.pl 2009-05-04
12:22:07 UTC (rev 2779)
@@ -466,6 +466,215 @@
'invalid tertiary ntp' => 'Invalid Tertiary NTP server address',
'tertiary ntp server' => 'Tertiary NTP Server',
+# from advproxy for proxy.cgi
+'common settings' => 'Common settings',
+'visible hostname' => 'Visible hostname',
+'admin mail' => 'Cache administrator e-mail',
+'error language' => 'Error messages language',
+'error design' => 'Error messages design',
+'suppress version' => 'Suppress version information',
+'squid version' => 'Squid Cache version',
+'standard' => 'Standard',
+'unknown' => 'Unknown',
+'upstream proxy' => 'Upstream proxy',
+'via forwarding' => 'Proxy address forwarding',
+'client IP forwarding' => 'Client IP address forwarding',
+'username forwarding' => 'Username forwarding',
+'no connection auth' => 'No connection oriented authentication forwarding',
+'log settings' => 'Log settings',
+'log query' => 'Log query terms',
+'log useragent' => 'Log useragents',
+'cache management' => 'Cache management',
+'hdd cache size' => 'Harddisk cache size (MB)',
+'ram cache size' => 'Memory cache size (MB)',
+'min size' => 'Min object size (KB)',
+'max size' => 'Max object size (KB)',
+'memory replacement policy' => 'Memory replacement policy',
+'cache replacement policy' => 'Cache replacement policy',
+'no cache sites' => 'Do not cache these destinations (one per line)',
+'number of L1 dirs' => 'Number of level-1 subdirectories',
+'offline mode' => 'Enable offline mode',
+'destination ports' => 'Destination ports',
+'standard ports' => 'Allowed standard ports (one per line)',
+'ssl ports' => 'Allowed SSL ports (one per line)',
+'network based access' => 'Network based access control',
+'allowed subnets' => 'Allowed subnets (one per line)',
+'no internal proxy' => 'Disable internal proxy access',
+'no internal proxy on green' => 'Disable internal proxy access to Green from
other subnets',
+'no internal proxy on blue' => 'Disable internal proxy access from Blue to
other subnets',
+'unrestricted ip clients' => 'Unrestricted IP addresses (one per line)',
+'unrestricted mac clients' => 'Unrestricted MAC addresses (one per line)',
+'banned ip clients' => 'Banned IP addresses (one per line)',
+'banned mac clients' => 'Banned MAC addresses (one per line)',
+'classroom extensions' => 'Classroom extensions',
+'supervisor password' => 'Supervisor password',
+'no cre groups' => 'There are no access groups available',
+'cre disabled' => 'The management interface has been disabled by the
Administrator',
+'cre group definitions' => 'Classroom group definitions',
+'cre supervisors' => 'Supervisor IP addresses (one per line)',
+'time restrictions' => 'Time restrictions',
+'access' => 'Access',
+'from' => 'From',
+'to' => 'To',
+'mode allow' => 'allow',
+'mode deny' => 'deny',
+'monday short' => 'Mon',
+'tuesday short' => 'Tue',
+'wednesday short' => 'Wed',
+'thursday short' => 'Thu',
+'friday short' => 'Fri',
+'saturday short' => 'Sat',
+'sunday short' => 'Sun',
+'max download size' => 'Max download size (KB)',
+'max upload size' => 'Max upload size (KB)',
+'download throttling' => 'Download throttling',
+'throttling total on' => 'Overall limit on',
+'throttling per host on' => 'Limit per host on',
+'throttling unlimited' => 'unlimited',
+'content based throttling' => 'Enable content based throttling',
+'throttle binary' => 'Binary files',
+'throttle dskimg' => 'CD images',
+'throttle mmedia' => 'Multimedia',
+'MIME filter' => 'MIME type filter',
+'MIME block types' => ' Block these MIME types (one per line)',
+'web browser' => 'Web browser',
+'allowed web browsers' => 'Allowed clients for web access',
+'no clients defined' => 'No clients defined',
+'UA enable filter' => 'Enable browser check',
+'privacy' => 'Privacy',
+'fake useragent' => 'Fake useragent submitted to external sites',
+'fake referer' => 'Fake referer submitted to external sites',
+'url filter' => 'URL filter',
+'update accelerator' => 'Update accelerator',
+'enabled' => 'Enabled',
+'save and restart' => 'Save and restart',
+'clear cache' => 'Clear Cache',
+'reset' => 'Reset',
+'back to main page' => 'Back to main page',
+'AUTH method' => 'Authentication method',
+'AUTH global settings' => 'Global authentication settings',
+'AUTH method none' => 'None',
+'AUTH method ncsa' => 'Local',
+'AUTH method ident' => 'identd',
+'AUTH method ldap' => 'LDAP',
+'AUTH method ntlm' => 'Windows',
+'AUTH method radius' => 'RADIUS',
+'AUTH limit of IP addresses' => 'Limit of IP addresses per user',
+'AUTH auth cache TTL' => 'Authentication cache TTL (in minutes)',
+'AUTH user IP cache TTL' => 'User/IP cache TTL (in minutes)',
+'AUTH number of auth processes' => 'Number of authentication processes',
+'AUTH always required' => 'Require authentication for unrestricted source
addresses',
+'AUTH realm' => 'Authentication realm prompt',
+'AUTH no auth' => 'Destinations without authentication (one per line)',
+'NCSA auth' => 'Local user authentication',
+'NCSA user management' => 'User management',
+'NCSA min password length' => 'Min password length',
+'NCSA redirector bypass' => 'Bypass redirection for members of the group',
+'NCSA create user' => 'Create user',
+'NCSA update user' => 'Update user',
+'NCSA user accounts' => 'User accounts',
+'NCSA no accounts' => 'No user accounts available',
+'NCSA username' => 'Username',
+'NCSA password' => 'Password',
+'NCSA password confirm' => 'Password (confirm)',
+'NCSA group' => 'Group',
+'NCSA group membership' => 'Group membership',
+'NCSA grp standard' => 'Standard',
+'NCSA grp extended' => 'Extended',
+'NCSA grp disabled' => 'Disabled',
+'IDENT identd settings' => 'Common identd settings',
+'IDENT required' => 'Require identd authentication',
+'IDENT timeout' => 'Ident timeout (in seconds)',
+'IDENT aware hosts' => 'Ident aware hosts (one per line)',
+'IDENT user based access restrictions' => 'User based access restrictions',
+'IDENT authorized users' => 'Authorized users (one per line)',
+'IDENT unauthorized users' => 'Unauthorized users (one per line)',
+'IDENT use positive access list' => 'Use positive access control',
+'IDENT use negative access list' => 'Use negative access control',
+'LDAP auth' => 'LDAP authentication',
+'LDAP common settings' => 'Common LDAP settings',
+'LDAP binddn settings' => 'Bind DN settings',
+'LDAP binddn username' => 'Bind DN username',
+'LDAP binddn password' => 'Bind DN password',
+'LDAP basedn' => 'Base DN',
+'LDAP server' => 'LDAP Server',
+'LDAP port' => 'Port',
+'LDAP group access control' => 'Group based access control',
+'LDAP group required' => 'Required group',
+'LDAP type' => 'LDAP type',
+'LDAP ADS' => 'Active Directory',
+'LDAP NDS' => 'Novell eDirectory',
+'LDAP V2' => 'LDAP version 2',
+'LDAP V3' => 'LDAP version 3',
+'NTLM auth' => 'Windows NT/2003 authentication',
+'NTLM domain settings' => 'Common domain settings',
+'NTLM domain' => 'Domain',
+'NTLM PDC hostname' => 'PDC hostname',
+'NTLM BDC hostname' => 'BDC hostname',
+'NTLM user based access restrictions' => 'User based access restrictions',
+'NTLM auth mode' => 'Authentication mode',
+'NTLM use integrated auth' => 'Enable Windows integrated authentication',
+'NTLM authorized users' => 'Authorized domain users (one per line)',
+'NTLM unauthorized users' => 'Unauthorized domain users (one per line)',
+'NTLM use positive access list' => 'Use positive access control',
+'NTLM use negative access list' => 'Use negative access control',
+'RADIUS radius settings' => 'Common RADIUS settings',
+'RADIUS server' => 'RADIUS Server',
+'RADIUS port' => 'Port',
+'RADIUS identifier' => 'Identifier',
+'RADIUS secret' => 'Shared secret',
+'RADIUS user based access restrictions' => 'User based access restrictions',
+'RADIUS authorized users' => 'Authorized users (one per line)',
+'RADIUS unauthorized users' => 'Unauthorized users (one per line)',
+'RADIUS use positive access list' => 'Use positive access control',
+'RADIUS use negative access list' => 'Use negative access control',
+'errmsg invalid proxy port' => 'Invalid proxy port',
+'errmsg invalid upstream proxy username or password setting' => 'Invalid
upstream proxy username or password setting',
+'errmsg hdd cache size' => 'Invalid value for harddisk cache size (min 10 MB
required)',
+'errmsg mem cache size' => 'Invalid value for memory cache size',
+'errmsg invalid destination port' => 'Invalid destination port',
+'errmsg time restriction' => 'Invalid time restriction',
+'errmsg no browser' => 'At least one browser or client must be selected for
web access',
+'errmsg auth children' => 'Invalid number of authentication processes',
+'errmsg auth cache ttl' => 'Invalid value for authentication cache TTL',
+'errmsg auth ipcache ttl' => 'Invalid value for user/IP cache TTL',
+'errmsg max userip' => 'Invalid number of IP addresses per user',
+'errmsg auth ipcache may not be null' => 'Authentication cache TTL may not be
0 when using IP address limits',
+'errmsg invalid ip or mask' => 'Invalid IP address or network mask',
+'errmsg invalid mac' => 'Invalid MAC address',
+'errmsg non-transparent proxy required' => 'Web Proxy must be running in
non-transparent mode for authentication',
+'errmsg ident timeout' => 'Invalid ident timeout',
+'errmsg ldap base dn' => 'LDAP base DN required',
+'errmsg ldap server' => 'Invalid IP address for LDAP Server',
+'errmsg ldap port' => 'Invalid LDAP port number',
+'errmsg ldap bind dn' => 'LDAP bind DN username and password required',
+'errmsg ntlm domain' => 'Windows domain name required',
+'errmsg ntlm pdc' => 'Hostname for Primary Domain Controller required',
+'errmsg invalid pdc' => 'Invalid hostname for Primary Domain Controller',
+'errmsg invalid bdc' => 'Invalid hostname for Backup Domain Controller',
+'errmsg radius server' => 'Invalid IP address for RADIUS Server',
+'errmsg radius port' => 'Invalid RADIUS port number',
+'errmsg radius secret' => 'RADIUS shared secret required',
+'errmsg acl cannot be empty' => 'Access control list cannot be empty',
+'errmsg no username' => 'Username can not be empty',
+'errmsg passwords different' => 'Passwords don\'t match',
+'errmsg password length 1' => 'Password must have at least ',
+'errmsg password length 2' => ' characters',
+'errmsg password length' => 'Invalid value for password length',
+'chgwebpwd change web password' => 'C h a n g e w e b a c c e s
s p a s s w o r d',
+'chgwebpwd username' => 'Username',
+'chgwebpwd old password' => 'Current password',
+'chgwebpwd new password' => 'New password',
+'chgwebpwd new password confirm' => 'New password (confirm)',
+'chgwebpwd change password' => 'Change password',
+'errmsg no password' => 'Password can not be empty',
+'errmsg invalid user' => 'Username does not exist',
+'errmsg password incorrect' => 'Password incorrect',
+'errmsg change fail' => 'Password could not be changed',
+'errmsg change success' => 'Password for web access sucessfully changed',
+'chgwebpwd SUCCESS' => 'S U C C E S S :',
+'chgwebpwd ERROR' => 'E R R O R :',
+
######## Stop Edit above ##########
);
Modified: ipcop/branches/template-branch/lfs/ipcop
===================================================================
--- ipcop/branches/template-branch/lfs/ipcop 2009-05-03 20:40:52 UTC (rev
2778)
+++ ipcop/branches/template-branch/lfs/ipcop 2009-05-04 12:22:07 UTC (rev
2779)
@@ -62,7 +62,7 @@
# Create all directories
for i in addon-lang alcatelusb auth backup ca certs cnx_pci crls ddns
dhcp dmzholes \
eagle-usb eciadsl ethernet firewall firmware isdn key logging
main modem \
- ovpn ovpn/ca ovpn/certs ovpn/crls ovpn/openssl patches \
+ ovpn ovpn/ca ovpn/ccd ovpn/certs ovpn/crls ovpn/openssl patches
\
portfw ppp private proxy red remote shaping time traffic vpn
xtaccess ; do \
mkdir -p $(CONFIG_ROOT)/$$i; \
done
Modified: ipcop/branches/template-branch/lfs/linux
===================================================================
--- ipcop/branches/template-branch/lfs/linux 2009-05-03 20:40:52 UTC (rev
2778)
+++ ipcop/branches/template-branch/lfs/linux 2009-05-04 12:22:07 UTC (rev
2779)
@@ -34,7 +34,7 @@
PKG_NAME = linux
VER = 2.6.27
-PATCHLEVEL = 2.6.27.21
+PATCHLEVEL = 2.6.27.22
HOST_ARCH = all
OTHER_SRC = yes
@@ -60,7 +60,7 @@
grsecurity-2.1.10-2.6.19.2-200701222307.patch.gz =
http://www.grsecurity.net/grsecurity-2.1.10-2.6.19.2-200701222307.patch.gz
$(DL_FILE)_MD5 =
b3e78977aa79d3754cb7f8143d7ddabd
-patch-$(PATCHLEVEL).bz2_MD5 =
9297d56c7e47f2977593d92e218228f2
+patch-$(PATCHLEVEL).bz2_MD5 =
3f2f55aef3f5555676f15d33f079e6ca
grsecurity-2.1.10-2.6.19.2-200701222307.patch.gz_MD5 =
718ccce29ce12064673dbe8eb4752696
install : $(TARGET)
Modified: ipcop/branches/template-branch/src/installer/installer.c
===================================================================
--- ipcop/branches/template-branch/src/installer/installer.c 2009-05-03
20:40:52 UTC (rev 2778)
+++ ipcop/branches/template-branch/src/installer/installer.c 2009-05-04
12:22:07 UTC (rev 2779)
@@ -931,7 +931,7 @@
if (userdisksize < disk_size) {
disk_size = userdisksize;
- fprintf(flog, "Use user selected max. disksize: %d MiB\n", disk_size);
+ fprintf(flog, "Use user selected max. disksize: %ld MiB\n", disk_size);
}
/* Partition, format, mount, initramfs and make bootable
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations
Conference from O'Reilly Media. Velocity features a full day of
expert-led, hands-on workshops and two days of sessions from industry
leaders in dedicated Performance & Operations tracks. Use code vel09scf
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
