[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 82e2a565bb054dd889b24a9418006f0abfe99cfa
by Michael Tremer 23 Oct '20
by Michael Tremer 23 Oct '20
23 Oct '20
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 82e2a565bb054dd889b24a9418006f0abfe99cfa (commit)
via 21b4b0c78b215763b2aacde13306a2c56fbcb00b (commit)
via c27b8825beeed2f45b5c6caa507363982675bd10 (commit)
via 934a376918ac343b299b6ffcc5d71d2a9d69cefa (commit)
from 449b1aeea70881b1c1cb228e644988ad38001497 (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 82e2a565bb054dd889b24a9418006f0abfe99cfa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 23 10:08:07 2020 +0000
Update credits.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 21b4b0c78b215763b2aacde13306a2c56fbcb00b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 23 10:07:37 2020 +0000
Update languages
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c27b8825beeed2f45b5c6caa507363982675bd10
Author: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
Date: Wed Oct 21 12:48:33 2020 +0100
Improve DHCP dynamic leases list usability. Active and expired leases are now grouped and the list is divided by a horizontal line. Sorting and creating static leases remains unchanged.
Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 934a376918ac343b299b6ffcc5d71d2a9d69cefa
Author: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
Date: Wed Oct 21 12:48:30 2020 +0100
Improve indentation and HTML output of PrintActualLeases & leasesort
Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/header.pl | 197 ++++++++++++++++++++++++++---------------------
doc/language_issues.en | 2 +-
html/cgi-bin/credits.cgi | 10 ++-
3 files changed, 117 insertions(+), 92 deletions(-)
Difference in files:
diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 1046f5992..e2e6fd689 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -403,87 +403,106 @@ sub PrintActualLeases
<th width='25%' align='center'><a href='$ENV{'SCRIPT_NAME'}?ETHER'><b>$tr{'mac address'}</b></a></th>
<th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?HOSTNAME'><b>$tr{'hostname'}</b></a></th>
<th width='25%' align='center'><a href='$ENV{'SCRIPT_NAME'}?ENDTIME'><b>$tr{'lease expires'} (local time d/m/y)</b></a></th>
-<th width='5%' align='center'><b>Add to fix leases<b></th>
+<th width='5%' align='center'><b>Add to fix leases</b></th>
</tr>
END
;
open(LEASES,"/var/state/dhcp/dhcpd.leases") or die "Can't open dhcpd.leases";
- while ($line = <LEASES>) {
- next if( $line =~ /^\s*#/ );
- chomp($line);
- @temp = split (' ', $line);
-
- if ($line =~ /^\s*lease/) {
- $ip = $temp[1];
- #All field are not necessarily read. Clear everything
- $endtime = 0;
- $ether = "";
- $hostname = "";
- }
+ while (my $line = <LEASES>) {
+ next if( $line =~ /^\s*#/ );
+ chomp($line);
+ @temp = split (' ', $line);
+
+ if ($line =~ /^\s*lease/) {
+ $ip = $temp[1];
+ #All field are not necessarily read. Clear everything
+ $endtime = 0;
+ $endtime_print = "";
+ $expired = 0;
+ $ether = "";
+ $hostname = "";
+ }
- if ($line =~ /^\s*ends/) {
- $line =~ /(\d+)\/(\d+)\/(\d+) (\d+):(\d+):(\d+)/;
- $endtime = timegm($6, $5, $4, $3, $2 - 1, $1 - 1900);
- }
+ if ($line =~ /^\s*ends/) {
+ $line =~ /(\d+)\/(\d+)\/(\d+) (\d+):(\d+):(\d+)/;
+ $endtime = timegm($6, $5, $4, $3, $2 - 1, $1 - 1900);
+ ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $dst) = localtime($endtime);
+ $endtime_print = sprintf ("%02d/%02d/%d %02d:%02d:%02d",$mday,$mon+1,$year+1900,$hour,$min,$sec);
+ $expired = $endtime < time();
+ }
- if ($line =~ /^\s*hardware ethernet/) {
- $ether = $temp[2];
- $ether =~ s/;//g;
- }
+ if ($line =~ /^\s*hardware ethernet/) {
+ $ether = $temp[2];
+ $ether =~ s/;//g;
+ }
- if ($line =~ /^\s*client-hostname/) {
- $hostname = "$temp[1] $temp[2] $temp[3]";
- $hostname =~ s/;//g;
- $hostname =~ s/\"//g;
- }
+ if ($line =~ /^\s*client-hostname/) {
+ $hostname = "$temp[1] $temp[2] $temp[3]";
+ $hostname =~ s/\"|[;\s]+?$//g; # remove quotes, trim semicolon and white space
+ }
- if ($line eq "}") {
- @record = ('IPADDR',$ip,'ENDTIME',$endtime,'ETHER',$ether,'HOSTNAME',$hostname);
- $record = {}; # create a reference to empty hash
- %{$record} = @record; # populate that hash with @record
- $entries{$record->{'IPADDR'}} = $record; # add this to a hash of hashes
- }
+ if ($line eq "}") {
+ @record = ('IPADDR',$ip,'ENDTIME',$endtime,'ETHER',$ether,'HOSTNAME',$hostname,'endtime_print',$endtime_print,'expired',$expired);
+ $record = {}; # create a reference to empty hash
+ %{$record} = @record; # populate that hash with @record
+ $entries{$record->{'IPADDR'}} = $record; # add this to a hash of hashes
+ }
}
close(LEASES);
my $id = 0;
- my $col="";
+ my $col = "";
+ my $divider_printed = 0;
foreach my $key (sort leasesort keys %entries) {
- print "<form method='post' action='/cgi-bin/dhcp.cgi'>\n";
- my $hostname = &cleanhtml($entries{$key}->{HOSTNAME},"y");
-
- if ($id % 2) {
- print "<tr>";
- $col="bgcolor='$table1colour'";
- }
- else {
- print "<tr>";
- $col="bgcolor='$table2colour'";
- }
-
- print <<END
+ my $hostname = &cleanhtml($entries{$key}->{HOSTNAME},"y");
+ my $hostname_print = $hostname;
+ if($hostname_print eq "") { #print blank space if no hostname is found
+ $hostname_print = " ";
+ }
+
+ # separate active and expired leases with a horizontal line
+ if(($entries{$key}->{expired}) && ($divider_printed == 0)) {
+ $divider_printed = 1;
+ if ($id % 2) {
+ print "<tr><td colspan='5' bgcolor='$table1colour'><hr size='1'></td></tr>\n";
+ } else {
+ print "<tr><td colspan='5' bgcolor='$table2colour'><hr size='1'></td></tr>\n";
+ }
+ $id++;
+ }
+
+ print "<form method='post' action='/cgi-bin/dhcp.cgi'><tr>\n";
+ if ($id % 2) {
+ $col="bgcolor='$table1colour'";
+ } else {
+ $col="bgcolor='$table2colour'";
+ }
+
+ if($entries{$key}->{expired}) {
+ print <<END
+<td align='center' $col><input type='hidden' name='FIX_ADDR' value='$entries{$key}->{IPADDR}' /><strike><i>$entries{$key}->{IPADDR}</i></strike></td>
+<td align='center' $col><input type='hidden' name='FIX_MAC' value='$entries{$key}->{ETHER}' /><strike><i>$entries{$key}->{ETHER}</i></strike></td>
+<td align='center' $col><input type='hidden' name='FIX_REMARK' value='$hostname' /><strike><i>$hostname_print<i><strike></td>
+<td align='center' $col><input type='hidden' name='FIX_ENABLED' value='on' /><strike><i>$entries{$key}->{endtime_print}</i></strike></td>
+END
+;
+ } else {
+ print <<END
<td align='center' $col><input type='hidden' name='FIX_ADDR' value='$entries{$key}->{IPADDR}' />$entries{$key}->{IPADDR}</td>
<td align='center' $col><input type='hidden' name='FIX_MAC' value='$entries{$key}->{ETHER}' />$entries{$key}->{ETHER}</td>
-<td align='center' $col><input type='hidden' name='FIX_REMARK' value='$hostname' /> $hostname</td>
-<td align='center' $col><input type='hidden' name='FIX_ENABLED' value='on' />
+<td align='center' $col><input type='hidden' name='FIX_REMARK' value='$hostname' />$hostname_print</td>
+<td align='center' $col><input type='hidden' name='FIX_ENABLED' value='on' />$entries{$key}->{endtime_print}</td>
END
;
+ }
- ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $dst) = localtime ($entries{$key}->{ENDTIME});
- $enddate = sprintf ("%02d/%02d/%d %02d:%02d:%02d",$mday,$mon+1,$year+1900,$hour,$min,$sec);
-
- if ($entries{$key}->{ENDTIME} < time() ){
- print "<strike>$enddate</strike>";
- } else {
- print "$enddate";
- }
- print <<END
-</td><td $col><input type='hidden' name='ACTION' value='$Lang::tr{'add'}2' /><input type='submit' name='SUBMIT' value='$Lang::tr{'add'}' />
-</td></tr></form>
+ print <<END
+<td $col><input type='hidden' name='ACTION' value='$Lang::tr{'add'}2' /><input type='submit' name='SUBMIT' value='$Lang::tr{'add'}' /></td>
+</tr></form>
END
;
- $id++;
+ $id++;
}
print "</table>";
@@ -493,34 +512,38 @@ END
# This sub is used during display of actives leases
sub leasesort {
- if (rindex ($dhcpsettings{'SORT_LEASELIST'},'Rev') != -1)
- {
- $qs=substr ($dhcpsettings{'SORT_LEASELIST'},0,length($dhcpsettings{'SORT_LEASELIST'})-3);
- if ($qs eq 'IPADDR') {
- @a = split(/\./,$entries{$a}->{$qs});
- @b = split(/\./,$entries{$b}->{$qs});
- ($b[0]<=>$a[0]) ||
- ($b[1]<=>$a[1]) ||
- ($b[2]<=>$a[2]) ||
- ($b[3]<=>$a[3]);
- }else {
- $entries{$b}->{$qs} cmp $entries{$a}->{$qs};
- }
- }
- else #not reverse
- {
- $qs=$dhcpsettings{'SORT_LEASELIST'};
- if ($qs eq 'IPADDR') {
- @a = split(/\./,$entries{$a}->{$qs});
- @b = split(/\./,$entries{$b}->{$qs});
- ($a[0]<=>$b[0]) ||
- ($a[1]<=>$b[1]) ||
- ($a[2]<=>$b[2]) ||
- ($a[3]<=>$b[3]);
- }else {
- $entries{$a}->{$qs} cmp $entries{$b}->{$qs};
+ if (rindex ($dhcpsettings{'SORT_LEASELIST'},'Rev') != -1)
+ {
+ $qs=substr ($dhcpsettings{'SORT_LEASELIST'},0,length($dhcpsettings{'SORT_LEASELIST'})-3);
+ if ($qs eq 'IPADDR') {
+ @a = split(/\./,$entries{$a}->{$qs});
+ @b = split(/\./,$entries{$b}->{$qs});
+ $entries{$a}->{'expired'} <=> $entries{$b}->{'expired'} || # always sort by expiration first
+ ($b[0]<=>$a[0]) ||
+ ($b[1]<=>$a[1]) ||
+ ($b[2]<=>$a[2]) ||
+ ($b[3]<=>$a[3]);
+ } else {
+ $entries{$a}->{'expired'} <=> $entries{$b}->{'expired'} ||
+ $entries{$b}->{$qs} cmp $entries{$a}->{$qs};
+ }
+ }
+ else #not reverse
+ {
+ $qs=$dhcpsettings{'SORT_LEASELIST'};
+ if ($qs eq 'IPADDR') {
+ @a = split(/\./,$entries{$a}->{$qs});
+ @b = split(/\./,$entries{$b}->{$qs});
+ $entries{$a}->{'expired'} <=> $entries{$b}->{'expired'} ||
+ ($a[0]<=>$b[0]) ||
+ ($a[1]<=>$b[1]) ||
+ ($a[2]<=>$b[2]) ||
+ ($a[3]<=>$b[3]);
+ } else {
+ $entries{$a}->{'expired'} <=> $entries{$b}->{'expired'} ||
+ $entries{$a}->{$qs} cmp $entries{$b}->{$qs};
+ }
}
- }
}
sub colorize {
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 63106d66b..c0a618da6 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1447,7 +1447,7 @@ WARNING: untranslated string: play = Play
WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes
WARNING: untranslated string: policy = Policy
WARNING: untranslated string: port = Port
-WARNING: untranslated string: portscans = portscancs
+WARNING: untranslated string: portscans = Port Scans
WARNING: untranslated string: ppp setup = PPP setup
WARNING: untranslated string: pppoe settings = Additional PPPoE settings:
WARNING: untranslated string: pptp netconfig = My Net Config
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index cc0b958ce..fe46a0580 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -67,8 +67,8 @@ Christian Schmidt,
Alexander Marx,
Matthias Fischer,
Peter Müller,
-Jan Paul Tücking,
Erik Kapfer,
+Jan Paul Tücking,
Jonatan Schlag,
Dirk Wagner,
Marcel Lorenz,
@@ -82,9 +82,10 @@ Stephan Feddersen,
Timo Eissler,
Jan Lentfer,
Marcus Scholz,
+Stéphane Pautrel,
Ersan Yildirim,
Jörn-Ingo Weigert,
-Stéphane Pautrel,
+Adolf Belka,
Alexander Koch,
Wolfgang Apolinarski,
Alfred Haas,
@@ -96,11 +97,11 @@ Florian Bührle,
Bernhard Bitsch,
Justin Luth,
Michael Eitelwein,
-Adolf Belka,
Alex Koch,
Dominik Hassler,
Larsen,
Gabriel Rolland,
+Marcel Follert,
Tim FitzGeorge,
Anton D. Seliverstov,
Bernhard Bittner,
@@ -108,6 +109,7 @@ David Kleuker,
Hans Horsten,
Jakub Ratajczak,
Jorrit de Jonge,
+Leo-Andres Hofmann,
Przemek Zdroik,
Ramax Lo,
Alexander Rudolf Gruber,
@@ -128,7 +130,6 @@ Julian McConnell,
Kay-Michael Köhler,
Kim Wölfel,
Logan Schmidt,
-Marcel Follert,
Markus Untersee,
Mathew McBride,
Nico Prenzel,
@@ -139,6 +140,7 @@ Rob Brewer,
Robert Möker,
Stefan Ernst,
Stefan Ferstl,
+Steffen Klammer,
Thomas Ebert,
Timmothy Wilson,
Umberto Parma
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, core151, created. c9f30dc9fc9932da3c0aabd83dc260a5eeac9218
by Arne Fitzenreiter 21 Oct '20
by Arne Fitzenreiter 21 Oct '20
21 Oct '20
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, core151 has been created
at c9f30dc9fc9932da3c0aabd83dc260a5eeac9218 (commit)
- Log -----------------------------------------------------------------
commit c9f30dc9fc9932da3c0aabd83dc260a5eeac9218
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 14 13:51:25 2020 +0000
core151: Do not ship the location database again
This might potentially downgrade the database and is a waste
of space in the update. Therefore we simply do not ship it here.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b5c4c15af38479627ee20854de8529937de7f4ad
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 14 13:49:46 2020 +0000
core151: Ship libloc again
This is necessary because some installations have a version
of Core Update 150 installed without the latest version.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree tag, v2.5-core150, created. d328c232d7df7bf3f8582388f428c47a92fab0c1
by Arne Fitzenreiter 21 Oct '20
by Arne Fitzenreiter 21 Oct '20
21 Oct '20
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 tag, v2.5-core150 has been created
at d328c232d7df7bf3f8582388f428c47a92fab0c1 (commit)
- Log -----------------------------------------------------------------
commit d328c232d7df7bf3f8582388f428c47a92fab0c1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Sep 28 10:27:24 2020 +0000
credits.cgi: update contributors
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 449b1aeea70881b1c1cb228e644988ad38001497
by Michael Tremer 19 Oct '20
by Michael Tremer 19 Oct '20
19 Oct '20
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 449b1aeea70881b1c1cb228e644988ad38001497 (commit)
via badd010f86a816fa0c5eb951225bb9796b463ef2 (commit)
from 7ad39d931a81d21eb03d12b411840ff1e59b1be0 (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 449b1aeea70881b1c1cb228e644988ad38001497
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 19 09:26:17 2020 +0000
core152: Ship proxy.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit badd010f86a816fa0c5eb951225bb9796b463ef2
Author: Steffen Klammer <steffen.klammer(a)staderschulen.de>
Date: Fri Oct 16 10:08:52 2020 +0200
modified proxy.cgi to make it possible that all subnets declared in "network access control" will be translated from cidr to subnet notation in proxy.pac
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/152/filelists/files | 1 +
html/cgi-bin/proxy.cgi | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
Difference in files:
diff --git a/config/rootfiles/core/152/filelists/files b/config/rootfiles/core/152/filelists/files
index aaf469bce..1007ce32e 100644
--- a/config/rootfiles/core/152/filelists/files
+++ b/config/rootfiles/core/152/filelists/files
@@ -10,5 +10,6 @@ etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/red
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/cgi-bin/proxy.cgi
usr/local/bin/setaliases
var/ipfire/graphs.pl
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index fdf9bddaf..a63e1c2df 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3004,7 +3004,8 @@ END
)
{
chomp $temp[1];
- print FILE " ||\n (isInNet(myIpAddress(), \"$temp[0]\", \"$temp[1]\"))";
+ my $tempmask = &Network::convert_prefix2netmask($temp[1]);
+ print FILE " ||\n (isInNet(myIpAddress(), \"$temp[0]\", \"$tempmask\"))";
}
}
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7ad39d931a81d21eb03d12b411840ff1e59b1be0
by Michael Tremer 15 Oct '20
by Michael Tremer 15 Oct '20
15 Oct '20
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 7ad39d931a81d21eb03d12b411840ff1e59b1be0 (commit)
via 97fbbaa33346c24d5d753bee862060d35ac09036 (commit)
via 488f36e446feee1aab5aff21a3d7131d2332fd3e (commit)
via 257025310482deb53232da572428e7206ffe6a9b (commit)
via 43e1c88ea499d79d33b701789579c53d40e002c9 (commit)
via d95cc821e7d7b252ad07cd8410ffc4973bd435b4 (commit)
from cbd0df20ed3a1089e21110d2bf200cbea3ac063a (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 7ad39d931a81d21eb03d12b411840ff1e59b1be0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 15 15:35:13 2020 +0000
core152: Ship suricata
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 97fbbaa33346c24d5d753bee862060d35ac09036
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Oct 15 17:31:54 2020 +0200
suricata: Update to 5.0.4
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 488f36e446feee1aab5aff21a3d7131d2332fd3e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 15 15:34:25 2020 +0000
core152: Ship libhtp
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 257025310482deb53232da572428e7206ffe6a9b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Oct 15 17:31:21 2020 +0200
libhtp: Update to 0.5.35
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 43e1c88ea499d79d33b701789579c53d40e002c9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 15 15:33:59 2020 +0000
core152: Ship yaml
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d95cc821e7d7b252ad07cd8410ffc4973bd435b4
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Oct 15 17:30:46 2020 +0200
yaml: Update to 0.2.5
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/yaml | 2 +-
config/rootfiles/{oldcore/131 => core/152}/filelists/libhtp | 0
config/rootfiles/{oldcore/131 => core/152}/filelists/suricata | 0
config/rootfiles/{oldcore/131 => core/152}/filelists/yaml | 0
config/rootfiles/core/152/update.sh | 1 +
lfs/libhtp | 4 ++--
lfs/suricata | 4 ++--
lfs/yaml | 4 ++--
8 files changed, 8 insertions(+), 7 deletions(-)
copy config/rootfiles/{oldcore/131 => core/152}/filelists/libhtp (100%)
copy config/rootfiles/{oldcore/131 => core/152}/filelists/suricata (100%)
copy config/rootfiles/{oldcore/131 => core/152}/filelists/yaml (100%)
Difference in files:
diff --git a/config/rootfiles/common/yaml b/config/rootfiles/common/yaml
index 565fa373f..626cfdfa6 100644
--- a/config/rootfiles/common/yaml
+++ b/config/rootfiles/common/yaml
@@ -1,6 +1,6 @@
#usr/include/yaml.h
usr/lib/libyaml-0.so.2
-usr/lib/libyaml-0.so.2.0.5
+usr/lib/libyaml-0.so.2.0.9
#usr/lib/libyaml.la
#usr/lib/libyaml.so
#usr/lib/pkgconfig/yaml-0.1.pc
diff --git a/config/rootfiles/core/152/filelists/libhtp b/config/rootfiles/core/152/filelists/libhtp
new file mode 120000
index 000000000..676e2c5e8
--- /dev/null
+++ b/config/rootfiles/core/152/filelists/libhtp
@@ -0,0 +1 @@
+../../../common/libhtp
\ No newline at end of file
diff --git a/config/rootfiles/core/152/filelists/suricata b/config/rootfiles/core/152/filelists/suricata
new file mode 120000
index 000000000..f671f6993
--- /dev/null
+++ b/config/rootfiles/core/152/filelists/suricata
@@ -0,0 +1 @@
+../../../common/suricata
\ No newline at end of file
diff --git a/config/rootfiles/core/152/filelists/yaml b/config/rootfiles/core/152/filelists/yaml
new file mode 120000
index 000000000..3dc14343f
--- /dev/null
+++ b/config/rootfiles/core/152/filelists/yaml
@@ -0,0 +1 @@
+../../../common/yaml
\ No newline at end of file
diff --git a/config/rootfiles/core/152/update.sh b/config/rootfiles/core/152/update.sh
index 5a1fa5c6d..d86839288 100644
--- a/config/rootfiles/core/152/update.sh
+++ b/config/rootfiles/core/152/update.sh
@@ -49,6 +49,7 @@ ldconfig
# Start services
/etc/init.d/unbound restart
+/etc/init.d/suricata restart
# This update needs a reboot...
#touch /var/run/need_reboot
diff --git a/lfs/libhtp b/lfs/libhtp
index 9cbc8480a..29f90b0b3 100644
--- a/lfs/libhtp
+++ b/lfs/libhtp
@@ -24,7 +24,7 @@
include Config
-VER = 0.5.33
+VER = 0.5.35
THISAPP = libhtp-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d01e386d1d8f13774239e920fcf143da
+$(DL_FILE)_MD5 = 188ebe7e1804f8bfaf00db007736f3f6
install : $(TARGET)
diff --git a/lfs/suricata b/lfs/suricata
index 9369500ac..f981232a2 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -24,7 +24,7 @@
include Config
-VER = 5.0.3
+VER = 5.0.4
THISAPP = suricata-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d302ae41735551e2e1198e965d452664
+$(DL_FILE)_MD5 = c08809d5641a790a95a56d4dc7eba2f2
install : $(TARGET)
diff --git a/lfs/yaml b/lfs/yaml
index 81cdd4fd1..c4d347e77 100644
--- a/lfs/yaml
+++ b/lfs/yaml
@@ -24,7 +24,7 @@
include Config
-VER = 0.2.1
+VER = 0.2.5
THISAPP = yaml-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 72724b9736923c517e5a8fc6757ef03d
+$(DL_FILE)_MD5 = bb15429d8fb787e7d3f1c83ae129a999
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, master, updated. c9f30dc9fc9932da3c0aabd83dc260a5eeac9218
by Michael Tremer 14 Oct '20
by Michael Tremer 14 Oct '20
14 Oct '20
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, master has been updated
via c9f30dc9fc9932da3c0aabd83dc260a5eeac9218 (commit)
via b5c4c15af38479627ee20854de8529937de7f4ad (commit)
from c69c820025c21713cdb77eae3dd4fa61ca71b5fb (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 c9f30dc9fc9932da3c0aabd83dc260a5eeac9218
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 14 13:51:25 2020 +0000
core151: Do not ship the location database again
This might potentially downgrade the database and is a waste
of space in the update. Therefore we simply do not ship it here.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b5c4c15af38479627ee20854de8529937de7f4ad
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 14 13:49:46 2020 +0000
core151: Ship libloc again
This is necessary because some installations have a version
of Core Update 150 installed without the latest version.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/151/exclude | 2 ++
config/rootfiles/{oldcore/148 => core/151}/filelists/libloc | 0
2 files changed, 2 insertions(+)
copy config/rootfiles/{oldcore/148 => core/151}/filelists/libloc (100%)
Difference in files:
diff --git a/config/rootfiles/core/151/exclude b/config/rootfiles/core/151/exclude
index e7500a03d..818039f4a 100644
--- a/config/rootfiles/core/151/exclude
+++ b/config/rootfiles/core/151/exclude
@@ -17,6 +17,7 @@ etc/sysconfig/firewall.local
etc/sysconfig/rc.local
etc/udev/rules.d/30-persistent-network.rules
srv/web/ipfire/html/proxy.pac
+usr/share/xt_geoip
var/ipfire/dma
var/ipfire/time
var/ipfire/firewall/locationblock
@@ -25,6 +26,7 @@ var/ipfire/ovpn
var/ipfire/urlfilter/blacklist
var/ipfire/urlfilter/settings
var/lib/alternatives
+var/lib/location/database.db
var/log/cache
var/log/dhcpcd.log
var/log/messages
diff --git a/config/rootfiles/core/151/filelists/libloc b/config/rootfiles/core/151/filelists/libloc
new file mode 120000
index 000000000..ff4a92429
--- /dev/null
+++ b/config/rootfiles/core/151/filelists/libloc
@@ -0,0 +1 @@
+../../../common/libloc
\ No newline at end of file
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cbd0df20ed3a1089e21110d2bf200cbea3ac063a
by Michael Tremer 14 Oct '20
by Michael Tremer 14 Oct '20
14 Oct '20
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 cbd0df20ed3a1089e21110d2bf200cbea3ac063a (commit)
via c69c820025c21713cdb77eae3dd4fa61ca71b5fb (commit)
via 64c8811dee6120fe4e2f803d7361f7eeef61b341 (commit)
via 0ccb2c1d154f32f033f188c086e658039c57d8c4 (commit)
via a5aba922a86254bf43eecbc0a875be2331b96120 (commit)
via 42772dcb4f251a74b7d0be95a68abf9d2a30a8d8 (commit)
via e768aab5adb687f619bbb44679216b9b9411bf23 (commit)
via 8468cf04891d9bdcf28c3378cc39333fd9fd6340 (commit)
via 36bcdbf7e4ba1c50f5a3bdc72fd0dc2f1dcf92bc (commit)
via 1bd80edc1d5e8ed2048e9565eae0746338cf1b26 (commit)
via 8649e14977d21923c7c1ee557e1e0e8b90fea0f3 (commit)
via 33637fc0470aa431b8e802f7fe5d84fb2ed4610a (commit)
via f94e17c7c26a3fa628ed2774091d97964a48fd12 (commit)
via 8936e2d21b57d96d86638208b427373bb16ac7ab (commit)
via 2fa655aec6f0e38696dd927a1deffe5370c06ac8 (commit)
via bd28bfd9d3d50bd863626d5d4ac1dc88b6d79b96 (commit)
via 03e7f9719ba4f656496941615d36484717da7ef8 (commit)
via 2d952a57d87abd6879bbea91cced0dcd966f0f3e (commit)
via 1aa4ecb1300069929c150ff389731225049bafc6 (commit)
via 98e11f47ac420fdefbad2bb91da4749a86663cc5 (commit)
via bdd97e5a502c41efea7d159b8a37c35210830518 (commit)
via 211105897dc5f494ceeb32c6a17ae66b661f2bdf (commit)
via e92b5a0435d7967648d421733bdac859ddcdb683 (commit)
via 42ebeaa88ef4debd332bd4ac2cf23ae3709bbc26 (commit)
via e1e399fb1077c8b1ace42711399d61b29536e470 (commit)
via d83d30d6305b2974012e15208b0f20543b6379df (commit)
via 83ae629a72d1796ae397aef7a7a7944ab7dc8d2b (commit)
via 9e329f75d6c5083587acebe57fa0941db20c71d7 (commit)
via 8dc8788beeecdd8a1ab28a350e22dfb9a624f1c0 (commit)
via c13b64f736328cd18a52a0bd8620a3591fe008d1 (commit)
via 86832d8955bf6d2b1da42275ad664b6325d487c3 (commit)
via 7dea42ae840aa1a268390b609d4c730abb4316e5 (commit)
via eef84767b0425924af530a70583cf9a46c010797 (commit)
via 4f00cf381f7729ce9744804eda8ac7f32ad10916 (commit)
via 70000894e9b1b46a79017027a6e61ef13ad69977 (commit)
via d7129fb10786f33e748da0f82cc783b6f1a1e8c8 (commit)
via 01c4d3ba0628c57fd908b105d384750f0f20653a (commit)
via be1554336d3f6dde722fe34dffb45419f21e04dd (commit)
via 97722ab69ddf99cb4928a4cacc483d77e85f3b3d (commit)
via 1c1493021225c389a0e42609173ad18191d2a8ca (commit)
via a88ea3463cec44f653452d4f6423bbf054714af2 (commit)
via 5aa5f6777a2e4a2f7841a556c03620d0ff737505 (commit)
via 13e455aec73b542a5cd96382df69e5ed2906b8b5 (commit)
via 1661f0f37f5cc303d542716c38189f2831c37d6d (commit)
via 762522e0af7b517dfcd083da8fa16691a6e5b1e7 (commit)
via 240b8048ad489d7d67dcb49a2f150e733ebffaf7 (commit)
via 18b7d734a9597bd76151b44b87446de1526b499b (commit)
via 6e3c67d608b9fcc9b302a1c2ee0ad491e72e6175 (commit)
via e0be282c098ad6a07310d5f52807c8701c4571d0 (commit)
via 7a60353472926dca2d9921c6933c85b257f1e5a6 (commit)
via 2a4ac08fccd3f442dfb4a560e14074701ccff9a3 (commit)
via 65deced1823daf001a86a769a3bdff562201a87d (commit)
via 160fc7b1abd5686631892c74a8193f388f631409 (commit)
via fb8e2c14df4a27348d1fbb4ba662ba1f4588d6ab (commit)
via 69c0addc8b94e195f3e65c7ef40c3736cc1bc5c5 (commit)
via 92d2e06568037335a0585d010dca70339b6cc882 (commit)
via 2bed30b224e3f5d3f3628bf2401a798b657cc862 (commit)
via 2db43d839e6e01179c4f2450ef3a0c4229cc407b (commit)
from 971f93ab126ffa64f54e7d684fd777c0adebaa97 (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 cbd0df20ed3a1089e21110d2bf200cbea3ac063a
Merge: 64c8811de c69c82002
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 14 10:35:41 2020 +0000
Merge branch 'master' into next
commit 64c8811dee6120fe4e2f803d7361f7eeef61b341
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 14 09:53:30 2020 +0000
samba: Update rootfiles
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0ccb2c1d154f32f033f188c086e658039c57d8c4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 14 09:51:27 2020 +0000
samba: Drop default printer configuration
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a5aba922a86254bf43eecbc0a875be2331b96120
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 13 17:07:07 2020 +0100
samba: Bump package version
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 42772dcb4f251a74b7d0be95a68abf9d2a30a8d8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 13 17:04:46 2020 +0100
samba: Allow rewriting configuration from CLI
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e768aab5adb687f619bbb44679216b9b9411bf23
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 13 16:49:33 2020 +0100
samba: Remove unused INTERFACES setting
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8468cf04891d9bdcf28c3378cc39333fd9fd6340
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 13 16:41:04 2020 +0100
samba: Use the same delete icon as everywhere else
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 36bcdbf7e4ba1c50f5a3bdc72fd0dc2f1dcf92bc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 13 16:36:05 2020 +0100
samba: Refactor user management
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1bd80edc1d5e8ed2048e9565eae0746338cf1b26
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 13 16:12:57 2020 +0100
samba: Set a useful default workgroup
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8649e14977d21923c7c1ee557e1e0e8b90fea0f3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 13 16:10:20 2020 +0100
samba: Remove tbl class from join form
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 33637fc0470aa431b8e802f7fe5d84fb2ed4610a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 13 16:09:05 2020 +0100
samba: Automatically migrate role setting
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f94e17c7c26a3fa628ed2774091d97964a48fd12
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 13 16:06:47 2020 +0100
samba: Replace security setting with server role
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8936e2d21b57d96d86638208b427373bb16ac7ab
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 13 15:57:23 2020 +0100
samba: Change share template to something more safe
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2fa655aec6f0e38696dd927a1deffe5370c06ac8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 17:41:46 2020 +0100
samba: Add recycle extension, too
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bd28bfd9d3d50bd863626d5d4ac1dc88b6d79b96
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 17:02:29 2020 +0100
samba: Drop choice to enable/disable wide links/UNIX extensions
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 03e7f9719ba4f656496941615d36484717da7ef8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 16:58:55 2020 +0100
samba: Enable support for Apple's OS X by default
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2d952a57d87abd6879bbea91cced0dcd966f0f3e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 16:35:05 2020 +0100
samba: Use full page width for all tables
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1aa4ecb1300069929c150ff389731225049bafc6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 16:33:38 2020 +0100
samba: Refactor status area
There is no need to double-wrap the status output in tables.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 98e11f47ac420fdefbad2bb91da4749a86663cc5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 16:24:26 2020 +0100
samba: Refactor shares section
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bdd97e5a502c41efea7d159b8a37c35210830518
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 16:08:14 2020 +0100
samba: Remove unused anchors
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 211105897dc5f494ceeb32c6a17ae66b661f2bdf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 16:06:25 2020 +0100
samba: Remove more legends
These are not helpful and any documentation should be living in the wiki
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e92b5a0435d7967648d421733bdac859ddcdb683
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 16:03:23 2020 +0100
samba: Replace save icon with a button and remove legend
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 42ebeaa88ef4debd332bd4ac2cf23ae3709bbc26
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 16:00:37 2020 +0100
samba: Re-indent global settings table
No functional changes
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e1e399fb1077c8b1ace42711399d61b29536e470
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 15:52:38 2020 +0100
samba: Replace icons on top of page with buttons
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d83d30d6305b2974012e15208b0f20543b6379df
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 15:45:21 2020 +0100
samba: Add tbl class to all <table>s
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 83ae629a72d1796ae397aef7a7a7944ab7dc8d2b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 15:39:21 2020 +0100
samba: Drop refresh page hack
This is very invalid HTML, very often inserted into spaces where
it should not be, and the page does not even need to be reloaded
after any action has been performed.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9e329f75d6c5083587acebe57fa0941db20c71d7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 15:37:03 2020 +0100
samba: Refactor service status
No functional changes
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8dc8788beeecdd8a1ab28a350e22dfb9a624f1c0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 12:36:25 2020 +0100
samba: Remove un-exported password sync option
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c13b64f736328cd18a52a0bd8620a3591fe008d1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 12:33:33 2020 +0100
samba: Remove move unused network variables
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 86832d8955bf6d2b1da42275ad664b6325d487c3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 12:31:14 2020 +0100
samba: Remove OS level
Samba will chose this automatically and the documentation advises
against changing the default.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7dea42ae840aa1a268390b609d4c730abb4316e5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 12:29:37 2020 +0100
samba: Drop PDC default configuration
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit eef84767b0425924af530a70583cf9a46c010797
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 12:26:58 2020 +0100
samba: Remove preferred master option
This is no longer relevant since we cannot run in domain
mode any longer.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4f00cf381f7729ce9744804eda8ac7f32ad10916
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 12:24:41 2020 +0100
samba: Remove local master option
It is not a good default to withdraw samba from the race of becoming
the local master browser. There is no reason why it couldn't be.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 70000894e9b1b46a79017027a6e61ef13ad69977
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 12:19:48 2020 +0100
samba: Drop support for being PDC for Windows NT domains
This is outdated, and nobody uses it
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d7129fb10786f33e748da0f82cc783b6f1a1e8c8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 9 12:14:22 2020 +0100
samba: Drop interfaces configuration
It is virtually impossible to limit samba to these interfaces only.
Therefore we add a static list of all interfaces of the local network.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 01c4d3ba0628c57fd908b105d384750f0f20653a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 22:56:36 2020 +0100
samba: Add option to require clients to encrypt the connection
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit be1554336d3f6dde722fe34dffb45419f21e04dd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 22:40:12 2020 +0100
samba: Export all printers from CUPS
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 97722ab69ddf99cb4928a4cacc483d77e85f3b3d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 22:37:04 2020 +0100
samba: Remove printer management
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1c1493021225c389a0e42609173ad18191d2a8ca
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 22:33:19 2020 +0100
samba: Always show printer options
Samba is always linked against CUPS and therefore there is
no way to disable printing anyways.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a88ea3463cec44f653452d4f6423bbf054714af2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 22:24:28 2020 +0100
samba: Remove help popup
This is outdated and should be put into the wiki.
It is also some very ugly JS.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5aa5f6777a2e4a2f7841a556c03620d0ff737505
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 22:19:17 2020 +0100
samba: Remove reset options
This only requires that we have to change multiple files with
the same settings.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 13e455aec73b542a5cd96382df69e5ed2906b8b5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 22:08:52 2020 +0100
samba: Log to syslog
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1661f0f37f5cc303d542716c38189f2831c37d6d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 21:55:32 2020 +0100
samba: Drop support for WINS
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 762522e0af7b517dfcd083da8fa16691a6e5b1e7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 21:52:49 2020 +0100
samba: Remove limitation that server only uses SMB2
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 240b8048ad489d7d67dcb49a2f150e733ebffaf7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 21:50:45 2020 +0100
samba: Drop netbios name option
It makes no sense that the same server has different host names
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 18b7d734a9597bd76151b44b87446de1526b499b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 21:49:02 2020 +0100
samba: Hard-code server string
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6e3c67d608b9fcc9b302a1c2ee0ad491e72e6175
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 21:47:12 2020 +0100
samba: Drop outdated character set settings
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e0be282c098ad6a07310d5f52807c8701c4571d0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 21:38:39 2020 +0100
sambactrl: Remove unused reset command
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7a60353472926dca2d9921c6933c85b257f1e5a6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 21:34:39 2020 +0100
samba: Remove any options left to default value in global section
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2a4ac08fccd3f442dfb4a560e14074701ccff9a3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 16:59:36 2020 +0100
samba: Remove deprecated encrypt/null passwords options
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 65deced1823daf001a86a769a3bdff562201a87d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 16:54:31 2020 +0100
samba: Update SECURITY option in settings, too
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 160fc7b1abd5686631892c74a8193f388f631409
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 16:52:34 2020 +0100
samba: Correctly escape status output
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fb8e2c14df4a27348d1fbb4ba662ba1f4588d6ab
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 16:51:23 2020 +0100
samba: Show status output in monospace font
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 69c0addc8b94e195f3e65c7ef40c3736cc1bc5c5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 16:48:16 2020 +0100
samba: Remove socket options
It is not useful to set this on a modern server. The Linux
kernel will be tuning any send and receive buffer sizes.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 92d2e06568037335a0585d010dca70339b6cc882
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 16:46:33 2020 +0100
samba: Remove deprecated syslog options
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2bed30b224e3f5d3f3628bf2401a798b657cc862
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 16:40:24 2020 +0100
samba: Migrate older backups too and use standard update mechasism
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2db43d839e6e01179c4f2450ef3a0c4229cc407b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 8 16:38:41 2020 +0100
samba: Migrate configuration from Samba 3.6 to 4.x
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/includes/samba | 1 -
config/firewall/rules.pl | 17 +
config/rootfiles/common/web-user-interface | 1 -
config/rootfiles/core/152/filelists/files | 1 +
config/rootfiles/oldcore/151/filelists/files | 1 +
config/rootfiles/packages/aarch64/samba | 10 +-
config/rootfiles/packages/armv5tel/samba | 10 +-
config/rootfiles/packages/i586/samba | 10 +-
config/rootfiles/packages/x86_64/samba | 10 +-
config/samba/default.global | 38 -
config/samba/default.pdc | 19 -
config/samba/default.printer | 22 -
config/samba/global | 21 +
config/samba/{default.settings => settings} | 0
config/samba/{default.shares => shares} | 0
doc/language_issues.de | 83 ++
doc/language_issues.en | 83 +-
doc/language_issues.es | 83 ++
doc/language_issues.fr | 83 ++
doc/language_issues.it | 83 ++
doc/language_issues.nl | 83 ++
doc/language_issues.pl | 83 ++
doc/language_issues.ru | 83 ++
doc/language_issues.tr | 83 ++
doc/language_missings | 88 ++
html/cgi-bin/logs.cgi/log.dat | 2 +
html/cgi-bin/samba.cgi | 1470 +++++++++-----------------
html/cgi-bin/sambahlp.cgi | 94 --
langs/en/cgi-bin/en.pl | 11 +
lfs/samba | 12 +-
src/misc-progs/sambactrl.c | 30 -
src/paks/samba/install.sh | 12 +
src/paks/samba/update.sh | 16 +-
33 files changed, 1318 insertions(+), 1325 deletions(-)
delete mode 100644 config/samba/default.global
delete mode 100644 config/samba/default.pdc
delete mode 100644 config/samba/default.printer
create mode 100644 config/samba/global
rename config/samba/{default.settings => settings} (100%)
rename config/samba/{default.shares => shares} (100%)
delete mode 100644 html/cgi-bin/sambahlp.cgi
Difference in files:
diff --git a/config/backup/includes/samba b/config/backup/includes/samba
index 67823bd19..1d2166ca5 100644
--- a/config/backup/includes/samba
+++ b/config/backup/includes/samba
@@ -1,6 +1,5 @@
/var/ipfire/samba/global
/var/ipfire/samba/pdc
-/var/ipfire/samba/printer
/var/ipfire/samba/private/
/var/ipfire/samba/settings
/var/ipfire/samba/shares
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index cad53a1d7..c2641a92d 100644
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -48,6 +48,13 @@ my @PROTOCOLS_WITH_PORTS = ("tcp", "udp");
my @VALID_TARGETS = ("ACCEPT", "DROP", "REJECT");
+my @PRIVATE_NETWORKS = (
+ "10.0.0.0/8",
+ "172.16.0.0/12",
+ "192.168.0.0/16",
+ "100.64.0.0/10",
+);
+
my %fwdfwsettings=();
my %fwoptions = ();
my %defaultNetworks=();
@@ -621,6 +628,16 @@ sub locationblock {
return;
}
+ # Only check the RED interface
+ if ($defaultNetworks{'RED_DEV'} ne "") {
+ run("$IPTABLES -A LOCATIONBLOCK ! -i $defaultNetworks{'RED_DEV'} -j RETURN");
+ }
+
+ # Do not check any private address space
+ foreach my $network (@PRIVATE_NETWORKS) {
+ run("$IPTABLES -A LOCATIONBLOCK -s $network -j RETURN");
+ }
+
# Loop through all supported locations and
# create iptables rules, if blocking for this country
# is enabled.
diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index aa32053a2..44856fcc2 100644
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -75,7 +75,6 @@ srv/web/ipfire/cgi-bin/qos.cgi
srv/web/ipfire/cgi-bin/remote.cgi
srv/web/ipfire/cgi-bin/routing.cgi
#srv/web/ipfire/cgi-bin/samba.cgi
-#srv/web/ipfire/cgi-bin/sambahlp.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/shutdown.cgi
srv/web/ipfire/cgi-bin/speed.cgi
diff --git a/config/rootfiles/core/152/filelists/files b/config/rootfiles/core/152/filelists/files
index ceb904c64..aaf469bce 100644
--- a/config/rootfiles/core/152/filelists/files
+++ b/config/rootfiles/core/152/filelists/files
@@ -9,5 +9,6 @@ etc/rc.d/helper/oci-setup
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/red
srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
usr/local/bin/setaliases
var/ipfire/graphs.pl
diff --git a/config/rootfiles/oldcore/151/filelists/files b/config/rootfiles/oldcore/151/filelists/files
index 8223d97de..9910e1bf9 100644
--- a/config/rootfiles/oldcore/151/filelists/files
+++ b/config/rootfiles/oldcore/151/filelists/files
@@ -10,6 +10,7 @@ srv/web/ipfire/cgi-bin/ipinfo.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/bin/probenic.sh
+usr/lib/firewall/rules.pl
usr/local/bin/ipsecctrl
var/ipfire/general-functions.pl
var/ipfire/langs
diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba
index 630ec9da8..9d88cbacf 100644
--- a/config/rootfiles/packages/aarch64/samba
+++ b/config/rootfiles/packages/aarch64/samba
@@ -793,14 +793,7 @@ usr/sbin/smbd
usr/sbin/winbindd
var/ipfire/backup/addons/includes/samba
#var/ipfire/samba
-var/ipfire/samba/default.global
-var/ipfire/samba/default.pdc
-var/ipfire/samba/default.printer
-var/ipfire/samba/default.settings
-var/ipfire/samba/default.shares
var/ipfire/samba/global
-var/ipfire/samba/pdc
-var/ipfire/samba/printer
#var/ipfire/samba/private
var/ipfire/samba/private/secrets.tdb
var/ipfire/samba/private/smbpasswd
@@ -813,8 +806,7 @@ var/lib/samba/bind-dns
var/lib/samba/private
var/lib/samba/winbindd_privileged
var/log/samba
-var/nmbd
+var/spool/samba
srv/web/ipfire/cgi-bin/samba.cgi
-srv/web/ipfire/cgi-bin/sambahlp.cgi
var/ipfire/menu.d/EX-samba.menu
usr/local/bin/sambactrl
diff --git a/config/rootfiles/packages/armv5tel/samba b/config/rootfiles/packages/armv5tel/samba
index 51349093b..fa039f604 100644
--- a/config/rootfiles/packages/armv5tel/samba
+++ b/config/rootfiles/packages/armv5tel/samba
@@ -793,14 +793,7 @@ usr/sbin/smbd
usr/sbin/winbindd
var/ipfire/backup/addons/includes/samba
#var/ipfire/samba
-var/ipfire/samba/default.global
-var/ipfire/samba/default.pdc
-var/ipfire/samba/default.printer
-var/ipfire/samba/default.settings
-var/ipfire/samba/default.shares
var/ipfire/samba/global
-var/ipfire/samba/pdc
-var/ipfire/samba/printer
#var/ipfire/samba/private
var/ipfire/samba/private/secrets.tdb
var/ipfire/samba/private/smbpasswd
@@ -813,8 +806,7 @@ var/lib/samba/bind-dns
var/lib/samba/private
var/lib/samba/winbindd_privileged
var/log/samba
-var/nmbd
+var/spool/samba
srv/web/ipfire/cgi-bin/samba.cgi
-srv/web/ipfire/cgi-bin/sambahlp.cgi
var/ipfire/menu.d/EX-samba.menu
usr/local/bin/sambactrl
diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba
index 089f6981d..1f406cc71 100644
--- a/config/rootfiles/packages/i586/samba
+++ b/config/rootfiles/packages/i586/samba
@@ -793,14 +793,7 @@ usr/sbin/smbd
usr/sbin/winbindd
var/ipfire/backup/addons/includes/samba
#var/ipfire/samba
-var/ipfire/samba/default.global
-var/ipfire/samba/default.pdc
-var/ipfire/samba/default.printer
-var/ipfire/samba/default.settings
-var/ipfire/samba/default.shares
var/ipfire/samba/global
-var/ipfire/samba/pdc
-var/ipfire/samba/printer
#var/ipfire/samba/private
var/ipfire/samba/private/secrets.tdb
var/ipfire/samba/private/smbpasswd
@@ -813,8 +806,7 @@ var/lib/samba/bind-dns
var/lib/samba/private
var/lib/samba/winbindd_privileged
var/log/samba
-var/nmbd
+var/spool/samba
srv/web/ipfire/cgi-bin/samba.cgi
-srv/web/ipfire/cgi-bin/sambahlp.cgi
var/ipfire/menu.d/EX-samba.menu
usr/local/bin/sambactrl
diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba
index ff2b7d5c3..2df36e438 100644
--- a/config/rootfiles/packages/x86_64/samba
+++ b/config/rootfiles/packages/x86_64/samba
@@ -793,14 +793,7 @@ usr/sbin/smbd
usr/sbin/winbindd
var/ipfire/backup/addons/includes/samba
#var/ipfire/samba
-var/ipfire/samba/default.global
-var/ipfire/samba/default.pdc
-var/ipfire/samba/default.printer
-var/ipfire/samba/default.settings
-var/ipfire/samba/default.shares
var/ipfire/samba/global
-var/ipfire/samba/pdc
-var/ipfire/samba/printer
#var/ipfire/samba/private
var/ipfire/samba/private/secrets.tdb
var/ipfire/samba/private/smbpasswd
@@ -813,8 +806,7 @@ var/lib/samba/bind-dns
var/lib/samba/private
var/lib/samba/winbindd_privileged
var/log/samba
-var/nmbd
+var/spool/samba
srv/web/ipfire/cgi-bin/samba.cgi
-srv/web/ipfire/cgi-bin/sambahlp.cgi
var/ipfire/menu.d/EX-samba.menu
usr/local/bin/sambactrl
diff --git a/config/samba/default.global b/config/samba/default.global
deleted file mode 100644
index 5a6a81729..000000000
--- a/config/samba/default.global
+++ /dev/null
@@ -1,38 +0,0 @@
-# global.settings by IPFire Project
-
-[global]
-netbios name = ipfire
-server string = Samba
-workgroup = homeip.net
-passdb backend = smbpasswd
-
-keep alive = 30
-os level = 33
-fstype = NTFS
-
-kernel oplocks = false
-map to guest = bad user
-smb ports = 445 139
-unix charset = CP850
-
-security = user
-encrypt passwords = yes
-guest account = samba
-unix password sync = false
-null passwords = yes
-
-bind interfaces only = true
-interfaces = green0 127.0.0.1
-socket options = TCP_NODELAY SO_KEEPALIVE
-
-username level = 1
-wins support = true
-
-log file = /var/log/samba/samba-log.%m
-lock directory = /var/lock/samba
-pid directory = /var/run/
-log level = 3 passdb:5 auth:5 winbind:2
-
-preferred master = false
-domain master = false
-local master = false
diff --git a/config/samba/default.pdc b/config/samba/default.pdc
deleted file mode 100644
index 73d2c4f9b..000000000
--- a/config/samba/default.pdc
+++ /dev/null
@@ -1,19 +0,0 @@
-[homes]
-path = /home/%U
-comment = Benutzer-Verzeichnisse
-browseable = yes
-writeable = yes
-valid users = %U
-
-[netlogon]
-path = /var/ipfire/samba/netlogon
-browseable = no
-writeable = no
-comment = NetLogON
-
-[profiles]
-path = /var/ipfire/samba/profiles
-browseable = no
-writeable = yes
-comment = Benutzerprofile
-valid users = %U
diff --git a/config/samba/default.printer b/config/samba/default.printer
deleted file mode 100644
index a4f04ccbd..000000000
--- a/config/samba/default.printer
+++ /dev/null
@@ -1,22 +0,0 @@
-[printers]
-comment = Drucker
-security = server
-path = /var/log/spool/lpd/lp
-lprm command = /usr/local/bin/lprm -P%p %j
-lpq command = /usr/local/bin/lpq %p
-browseable = yes
-printable = yes
-public = yes
-writable = no
-create mode = 0700
-use client driver = yes
-
-[Drucker]
-security = server
-path = /var/log/spool/lpd/lp
-printer name = lp
-writable = no
-public = yes
-printable = yes
-print command = lpr -r -h -P %p %s
-use client driver = Yes
diff --git a/config/samba/global b/config/samba/global
new file mode 100644
index 000000000..05d09a9a2
--- /dev/null
+++ b/config/samba/global
@@ -0,0 +1,21 @@
+# global.settings by IPFire Project
+
+[global]
+netbios name = ipfire
+server string = Samba
+workgroup = homeip.net
+passdb backend = smbpasswd
+
+os level = 33
+
+map to guest = bad user
+
+security = user
+guest account = samba
+unix password sync = false
+
+bind interfaces only = true
+interfaces = green0 127.0.0.1
+
+log file = /var/log/samba/samba-log.%m
+log level = 3 passdb:5 auth:5 winbind:2
diff --git a/config/samba/default.settings b/config/samba/settings
similarity index 100%
rename from config/samba/default.settings
rename to config/samba/settings
diff --git a/config/samba/default.shares b/config/samba/shares
similarity index 100%
rename from config/samba/default.shares
rename to config/samba/shares
diff --git a/doc/language_issues.de b/doc/language_issues.de
index f2a7ba8ae..6fcafc460 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -35,16 +35,23 @@ WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Verbose
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
+WARNING: translation string unused: accounting
+WARNING: translation string unused: accounting user nonpdc
+WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
+WARNING: translation string unused: active
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
WARNING: translation string unused: add new ovpn
+WARNING: translation string unused: add printer
WARNING: translation string unused: add service
WARNING: translation string unused: add subclass
WARNING: translation string unused: add xtaccess
WARNING: translation string unused: add-route
WARNING: translation string unused: addon
WARNING: translation string unused: admin user password has been changed
+WARNING: translation string unused: admin users
WARNING: translation string unused: administrator user password
WARNING: translation string unused: adsl settings
WARNING: translation string unused: advproxy AUTH method ntlm
@@ -138,10 +145,13 @@ WARNING: translation string unused: ccd err iroute
WARNING: translation string unused: ccd err netadr
WARNING: translation string unused: ccd maxclients
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: class in use
WARNING: translation string unused: clear cache
+WARNING: translation string unused: client
+WARNING: translation string unused: comment
WARNING: translation string unused: compression
WARNING: translation string unused: connect
WARNING: translation string unused: connect the modem
@@ -157,6 +167,7 @@ WARNING: translation string unused: could not open available updates file
WARNING: translation string unused: could not open installed updates file
WARNING: translation string unused: could not open update information file
WARNING: translation string unused: create
+WARNING: translation string unused: create mask
WARNING: translation string unused: create new backup
WARNING: translation string unused: current dynamic leases
WARNING: translation string unused: current media
@@ -173,6 +184,7 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
@@ -180,6 +192,9 @@ WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: deprecated fs warn
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
@@ -194,8 +209,11 @@ WARNING: translation string unused: dhcp mode
WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
+WARNING: translation string unused: directory mask
+WARNING: translation string unused: directory writeable
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
+WARNING: translation string unused: display charset
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -221,8 +239,10 @@ WARNING: translation string unused: dns server
WARNING: translation string unused: dns servers
WARNING: translation string unused: dnssec information
WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: domain master
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
+WARNING: translation string unused: dos charset
WARNING: translation string unused: download dh parameter
WARNING: translation string unused: download new ruleset
WARNING: translation string unused: driver
@@ -233,6 +253,7 @@ WARNING: translation string unused: eciadsl help
WARNING: translation string unused: eciadsl upload
WARNING: translation string unused: edit a rule
WARNING: translation string unused: edit network
+WARNING: translation string unused: edit printer
WARNING: translation string unused: edit service
WARNING: translation string unused: editor
WARNING: translation string unused: eg
@@ -262,6 +283,7 @@ WARNING: translation string unused: esp encryption
WARNING: translation string unused: esp grouptype
WARNING: translation string unused: esp integrity
WARNING: translation string unused: esp keylife
+WARNING: translation string unused: exampel
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
@@ -277,6 +299,7 @@ WARNING: translation string unused: filename
WARNING: translation string unused: firmware
WARNING: translation string unused: firmware upload
WARNING: translation string unused: force update
+WARNING: translation string unused: force user
WARNING: translation string unused: forward firewall
WARNING: translation string unused: forwarding rule added
WARNING: translation string unused: forwarding rule removed
@@ -340,11 +363,14 @@ WARNING: translation string unused: generatepolicy
WARNING: translation string unused: generatereport
WARNING: translation string unused: genkey
WARNING: translation string unused: green interface
+WARNING: translation string unused: guest ok
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
+WARNING: translation string unused: host allow
WARNING: translation string unused: host configuration
+WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
@@ -359,12 +385,14 @@ WARNING: translation string unused: ike lifetime
WARNING: translation string unused: import
WARNING: translation string unused: importkey
WARNING: translation string unused: in
+WARNING: translation string unused: inactive
WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
+WARNING: translation string unused: interfaces
WARNING: translation string unused: intrusion detection system log viewer
WARNING: translation string unused: intrusion detection system2
WARNING: translation string unused: intrusion prevention system
@@ -377,6 +405,7 @@ WARNING: translation string unused: invalid port list
WARNING: translation string unused: invalid time entered
WARNING: translation string unused: invalid uplink speed
WARNING: translation string unused: invalid upstream proxy username or password setting
+WARNING: translation string unused: invalid users
WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
@@ -396,15 +425,19 @@ WARNING: translation string unused: lang
WARNING: translation string unused: lateprompting
WARNING: translation string unused: length
WARNING: translation string unused: line
+WARNING: translation string unused: load printer
WARNING: translation string unused: loaded modules
WARNING: translation string unused: local hard disk
+WARNING: translation string unused: local master
WARNING: translation string unused: localkey
WARNING: translation string unused: localkeyfile
WARNING: translation string unused: locationblock country code
WARNING: translation string unused: locationblock country name
WARNING: translation string unused: locationblock flag
WARNING: translation string unused: log enabled
+WARNING: translation string unused: log level
WARNING: translation string unused: log var messages
+WARNING: translation string unused: log view
WARNING: translation string unused: log viewer
WARNING: translation string unused: logging
WARNING: translation string unused: loosedirectorychecking
@@ -422,6 +455,7 @@ WARNING: translation string unused: mac address error not 00
WARNING: translation string unused: mailmethod
WARNING: translation string unused: mailprogramm
WARNING: translation string unused: manage ovpn
+WARNING: translation string unused: manage printers
WARNING: translation string unused: manual
WARNING: translation string unused: manual control and status
WARNING: translation string unused: marked
@@ -432,6 +466,7 @@ WARNING: translation string unused: mbmon fan in
WARNING: translation string unused: mbmon graphs
WARNING: translation string unused: mbmon temp in
WARNING: translation string unused: mbmon value
+WARNING: translation string unused: meaning
WARNING: translation string unused: messages logging
WARNING: translation string unused: min size
WARNING: translation string unused: missing dat
@@ -449,8 +484,10 @@ WARNING: translation string unused: monthly traffic bad
WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
+WARNING: translation string unused: more
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
+WARNING: translation string unused: my new share
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net
WARNING: translation string unused: net address
@@ -458,6 +495,7 @@ WARNING: translation string unused: net config type
WARNING: translation string unused: net config type help
WARNING: translation string unused: net traffic newversion
WARNING: translation string unused: net-traffic configuration
+WARNING: translation string unused: netbios name
WARNING: translation string unused: network added
WARNING: translation string unused: network configuration
WARNING: translation string unused: network removed
@@ -474,10 +512,12 @@ WARNING: translation string unused: no eciadsl synch.bin file
WARNING: translation string unused: no fritzdsl driver
WARNING: translation string unused: no hardware random number generator
WARNING: translation string unused: no information available
+WARNING: translation string unused: no log selected
WARNING: translation string unused: no modem selected
WARNING: translation string unused: no set selected
WARNING: translation string unused: nonetworkname
WARNING: translation string unused: noservicename
+WARNING: translation string unused: not set
WARNING: translation string unused: o-no
WARNING: translation string unused: o-yes
WARNING: translation string unused: online help en
@@ -490,6 +530,7 @@ WARNING: translation string unused: optionsfw portlist hint
WARNING: translation string unused: optionsfw warning
WARNING: translation string unused: or
WARNING: translation string unused: original
+WARNING: translation string unused: os level
WARNING: translation string unused: other
WARNING: translation string unused: our donors
WARNING: translation string unused: out
@@ -551,6 +592,10 @@ WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
+WARNING: translation string unused: path to directory
+WARNING: translation string unused: pc
+WARNING: translation string unused: pc add
+WARNING: translation string unused: pdc options
WARNING: translation string unused: phase1 group
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
@@ -559,7 +604,13 @@ WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
+WARNING: translation string unused: prefered master
WARNING: translation string unused: present
+WARNING: translation string unused: printcap name
+WARNING: translation string unused: printer
+WARNING: translation string unused: printername
+WARNING: translation string unused: printing
+WARNING: translation string unused: printing options
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
@@ -568,6 +619,7 @@ WARNING: translation string unused: proxy no proxy local
WARNING: translation string unused: proxy port
WARNING: translation string unused: psk
WARNING: translation string unused: qos add subclass
+WARNING: translation string unused: read list
WARNING: translation string unused: reboot ask
WARNING: translation string unused: reboot question
WARNING: translation string unused: reboot schedule
@@ -580,8 +632,12 @@ WARNING: translation string unused: reportlevel
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
+WARNING: translation string unused: reset shares
+WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
+WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -592,7 +648,10 @@ WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: runmode
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -600,20 +659,28 @@ WARNING: translation string unused: selecttraffic
WARNING: translation string unused: send email notification
WARNING: translation string unused: send test mail
WARNING: translation string unused: server reserved
+WARNING: translation string unused: server string
WARNING: translation string unused: service added
WARNING: translation string unused: service removed
WARNING: translation string unused: service updated
WARNING: translation string unused: servicename
WARNING: translation string unused: services settings
+WARNING: translation string unused: set
WARNING: translation string unused: shaping list options
+WARNING: translation string unused: show last x lines
+WARNING: translation string unused: show share options
WARNING: translation string unused: shutdown ask
WARNING: translation string unused: shutdown sure
WARNING: translation string unused: shutdown2
WARNING: translation string unused: sitekey
WARNING: translation string unused: sitekeyfile
WARNING: translation string unused: smbreload
+WARNING: translation string unused: smbrestart
+WARNING: translation string unused: smbstart
+WARNING: translation string unused: smbstop
WARNING: translation string unused: smtphost
WARNING: translation string unused: smtpport
+WARNING: translation string unused: socket options
WARNING: translation string unused: source ip bad
WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
@@ -699,6 +766,8 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: unix charset
+WARNING: translation string unused: unix password sync
WARNING: translation string unused: update transcript
WARNING: translation string unused: updatedatabase
WARNING: translation string unused: updates
@@ -735,6 +804,7 @@ WARNING: translation string unused: use
WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
+WARNING: translation string unused: visible in browselist
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn delayed start
WARNING: translation string unused: vpn delayed start help
@@ -750,6 +820,8 @@ WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
+WARNING: translation string unused: wins server
+WARNING: translation string unused: wins support
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
@@ -767,6 +839,9 @@ WARNING: translation string unused: zoneconf val ppp assignment error
WARNING: translation string unused: zoneconf val vlan amount assignment error
WARNING: translation string unused: zoneconf val vlan tag assignment error
WARNING: translation string unused: zoneconf val zoneslave amount error
+WARNING: untranslated string: desired = Desired
+WARNING: untranslated string: disable = Disable
+WARNING: untranslated string: enable = Enable
WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date!
WARNING: untranslated string: fwhost cust locationgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
@@ -799,9 +874,17 @@ WARNING: untranslated string: guardian logtarget_file = unknown string
WARNING: untranslated string: guardian logtarget_syslog = unknown string
WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
+WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
WARNING: untranslated string: no entries = No entries at the moment.
+WARNING: untranslated string: optional = Optional
WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: required = Required
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
WARNING: untranslated string: routing config changed = unknown string
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: show tls-auth key = Show tls-auth key
+WARNING: untranslated string: smb daemon = SMB Daemon
+WARNING: untranslated string: user management = User Management
+WARNING: untranslated string: winbind daemon = Winbind Daemon
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 5b2e23def..63106d66b 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -92,25 +92,18 @@ WARNING: untranslated string: a ca certificate with this name already exists = A
WARNING: untranslated string: a connection with this common name already exists = A connection with this common name already exists.
WARNING: untranslated string: a connection with this name already exists = A connection with this name already exists.
WARNING: untranslated string: abort = abort
-WARNING: untranslated string: accounting = Accounting
-WARNING: untranslated string: accounting user nonpdc = Accounting - none PDC Mode
-WARNING: untranslated string: accounting user pdc = Accounting - PDC Mode
WARNING: untranslated string: acpitemp = ACPI - Temperatures
WARNING: untranslated string: action = Action
WARNING: untranslated string: activate = Activate
-WARNING: untranslated string: activate user = Activate user
-WARNING: untranslated string: active = Active
WARNING: untranslated string: add = Add
WARNING: untranslated string: add a host = Add a host
WARNING: untranslated string: add device = Add device
WARNING: untranslated string: add new alias = Add a new alias
WARNING: untranslated string: add new lease = Add a new fixed lease
-WARNING: untranslated string: add printer = Add printer
WARNING: untranslated string: add share = Add share
WARNING: untranslated string: add user = Add user
WARNING: untranslated string: added from dhcp lease list = Added from DHCP lease list
WARNING: untranslated string: addons = Addons
-WARNING: untranslated string: admin users = User with superuser rights
WARNING: untranslated string: administrator password = Administrator password
WARNING: untranslated string: administrator username = Administrator username
WARNING: untranslated string: advanced = Advanced
@@ -462,7 +455,6 @@ WARNING: untranslated string: certificate does not have a valid ca associated wi
WARNING: untranslated string: certificate file move failed = Certificate file move failed
WARNING: untranslated string: chain = Chain
WARNING: untranslated string: change passwords = Change passwords
-WARNING: untranslated string: change share = edit share options
WARNING: untranslated string: check all = Check all
WARNING: untranslated string: check vpn lr = Check
WARNING: untranslated string: cipher = Encryption:
@@ -471,10 +463,8 @@ WARNING: untranslated string: clear playlist = Empty playlist
WARNING: untranslated string: clenabled = Provide time to local network
WARNING: untranslated string: click to disable = Enabled (click to disable)
WARNING: untranslated string: click to enable = Disabled (click to enable)
-WARNING: untranslated string: client = Workstation Name
WARNING: untranslated string: clock has not been synchronized = Clock has not been synchronized
WARNING: untranslated string: clock last synchronized at = Clock was last synchronized at
-WARNING: untranslated string: comment = Description:
WARNING: untranslated string: common name = Common name
WARNING: untranslated string: community rules = Snort/VRT GPLv2 Community Rules
WARNING: untranslated string: comp-lzo = LZO-Compression:
@@ -513,7 +503,6 @@ WARNING: untranslated string: cpu steal usage = Steal CPU Usage
WARNING: untranslated string: cpu system usage = System CPU Usage
WARNING: untranslated string: cpu usage per = CPU Usage per
WARNING: untranslated string: cpu user usage = User CPU Usage
-WARNING: untranslated string: create mask = UNIX rights for new created files
WARNING: untranslated string: credits = Credits
WARNING: untranslated string: crl = Certificate Revocation List
WARNING: untranslated string: cron server = CRON Server
@@ -539,7 +528,6 @@ WARNING: untranslated string: ddns hostname added = Dynamic DNS hostname added
WARNING: untranslated string: ddns hostname modified = Dynamic DNS hostname modified
WARNING: untranslated string: ddns hostname removed = Dynamic DNS hostname removed
WARNING: untranslated string: deactivate = deactivate
-WARNING: untranslated string: deactivate user = deactivate user
WARNING: untranslated string: dead peer detection = Dead Peer Detection
WARNING: untranslated string: december = December
WARNING: untranslated string: def lease time = Default Lease Time
@@ -548,10 +536,8 @@ WARNING: untranslated string: default IP address = Default IP Address
WARNING: untranslated string: default lease time = Default lease time (mins):
WARNING: untranslated string: default renewal time = Default Renewal Time
WARNING: untranslated string: delete = Delete
-WARNING: untranslated string: delete pc = Delete workstation
-WARNING: untranslated string: delete share = Delete share
-WARNING: untranslated string: delete user = Delete user
WARNING: untranslated string: demon login script = Demon login script
+WARNING: untranslated string: desired = Desired
WARNING: untranslated string: dest ip and port = Dest. IP: Port
WARNING: untranslated string: destination = Destination
WARNING: untranslated string: destination ip = Destination IP
@@ -599,14 +585,12 @@ WARNING: untranslated string: dial = Connect
WARNING: untranslated string: dial profile = Connect with profile
WARNING: untranslated string: dialing mode = Dialing mode:
WARNING: untranslated string: dialup red not ppp = Dialup profiles can only used if <b>RED</b> is set to <b>PPP Dialup</b><BR>Check the networking setup.
-WARNING: untranslated string: directory mask = UNIX directory rights
-WARNING: untranslated string: directory writeable = directory writeable
+WARNING: untranslated string: disable = Disable
WARNING: untranslated string: disabled = disabled
WARNING: untranslated string: disconnected = Disconnected
WARNING: untranslated string: disk access = Disk Access
WARNING: untranslated string: disk usage = Disk usage
WARNING: untranslated string: display = Display
-WARNING: untranslated string: display charset = Display Charset
WARNING: untranslated string: display hostname in window title = Display hostname in window title
WARNING: untranslated string: dl client arch = Download Client Package (zip)
WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
@@ -647,12 +631,10 @@ WARNING: untranslated string: dod for dns = Dial on Demand for DNS:
WARNING: untranslated string: dod not compatible with ddns = Dial on demand is not compatible with dynamic dns services
WARNING: untranslated string: dod waiting = Dial on Demand waiting
WARNING: untranslated string: domain = Domain
-WARNING: untranslated string: domain master = Domain Master
WARNING: untranslated string: domain name = Domain name
WARNING: untranslated string: domain name suffix = Domain name suffix:
WARNING: untranslated string: donation = Donation
WARNING: untranslated string: donation-text = <strong>IPFire</strong> is driven and maintained by volunteers in their free time. To keep this project running costs incurred, if you like to support us we would be pleased by a small donation.
-WARNING: untranslated string: dos charset = DOS Charset
WARNING: untranslated string: down and up speed = Enter your Down- and Uplink-Speed <br /> and then press <i>Save</i>.
WARNING: untranslated string: downlink = Downlink
WARNING: untranslated string: downlink speed = Downlink speed (kbit/sec)
@@ -695,7 +677,6 @@ WARNING: untranslated string: edit an existing host = Edit an existing host
WARNING: untranslated string: edit an existing lease = Edit an existing lease
WARNING: untranslated string: edit device = Edit device
WARNING: untranslated string: edit hosts = Edit Hosts
-WARNING: untranslated string: edit printer = edit printer
WARNING: untranslated string: edit share = Edit share
WARNING: untranslated string: eight hours = 8 Hours
WARNING: untranslated string: email config = Configuration
@@ -720,6 +701,7 @@ WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules
WARNING: untranslated string: empty = This field may be left blank
WARNING: untranslated string: empty profile = empty
+WARNING: untranslated string: enable = Enable
WARNING: untranslated string: enable ignore filter = Enable ignore filter
WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
WARNING: untranslated string: enabled = Enabled:
@@ -736,7 +718,6 @@ WARNING: untranslated string: error messages = Error messages
WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date!
WARNING: untranslated string: esp keylife should be between 1 and 24 hours = ESP keylife should be between 1 and 24 hours.
WARNING: untranslated string: every = Every
-WARNING: untranslated string: exampel = example
WARNING: untranslated string: exclude logfiles = Exclude logfiles
WARNING: untranslated string: excluding buffers and cache = -/+ buffers/cache
WARNING: untranslated string: expires = Expires
@@ -798,7 +779,6 @@ WARNING: untranslated string: fixed ip lease modified = Fixed IP lease modified
WARNING: untranslated string: fixed ip lease removed = Fixed IP lease removed
WARNING: untranslated string: flag = Flag
WARNING: untranslated string: force enable = Forced
-WARNING: untranslated string: force user = force all new file to user
WARNING: untranslated string: foreshadow = Foreshadow
WARNING: untranslated string: four hours = 4 Hours
WARNING: untranslated string: free = Free
@@ -1012,7 +992,6 @@ WARNING: untranslated string: guardian logtarget_file = unknown string
WARNING: untranslated string: guardian logtarget_syslog = unknown string
WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
-WARNING: untranslated string: guest ok = allow guests to access
WARNING: untranslated string: gui settings = GUI Settings
WARNING: untranslated string: hangup = Disconnect
WARNING: untranslated string: hangup string = Hangup:
@@ -1025,9 +1004,7 @@ WARNING: untranslated string: help = Help
WARNING: untranslated string: high = High
WARNING: untranslated string: high memory usage = High memory usage
WARNING: untranslated string: holdoff = Holdoff time (in seconds)
-WARNING: untranslated string: host allow = list with allowed hosts
WARNING: untranslated string: host certificate = Host Certificate
-WARNING: untranslated string: host deny = list with denied hosts
WARNING: untranslated string: host ip = Host IP address
WARNING: untranslated string: host to net vpn = Host-to-Net Virtual Private Network (RoadWarrior)
WARNING: untranslated string: hostname = Hostname
@@ -1065,7 +1042,6 @@ WARNING: untranslated string: ignore filter = Ignore filter
WARNING: untranslated string: ike lifetime should be between 1 and 24 hours = IKE lifetime should be between 1 and 24 hours.
WARNING: untranslated string: imei = IMEI
WARNING: untranslated string: imsi = IMSI
-WARNING: untranslated string: inactive = inactive
WARNING: untranslated string: include logfiles = Include logfiles
WARNING: untranslated string: incoming = incoming
WARNING: untranslated string: incoming compression in bytes per second = Incoming Compression
@@ -1079,7 +1055,6 @@ WARNING: untranslated string: instant update = Instant Update
WARNING: untranslated string: integrity = Integrity:
WARNING: untranslated string: interface = Interface
WARNING: untranslated string: interface mode = Interface
-WARNING: untranslated string: interfaces = Interfaces
WARNING: untranslated string: internet = INTERNET
WARNING: untranslated string: intrusion detection = Intrusion Prevention
WARNING: untranslated string: intrusion detection system = Intrusion Prevention System
@@ -1144,7 +1119,6 @@ WARNING: untranslated string: invalid secondary dns = Invalid secondary DNS.
WARNING: untranslated string: invalid secondary ntp = Invalid Secondary NTP server address
WARNING: untranslated string: invalid start address = Invalid start address.
WARNING: untranslated string: invalid time period = Invalid time period
-WARNING: untranslated string: invalid users = list with users denied to access
WARNING: untranslated string: invalid vpi vpci = Invalid VPI/VPCI settings
WARNING: untranslated string: invalid wins address = Invalid WINS server address.
WARNING: untranslated string: ip address = IP address
@@ -1187,9 +1161,7 @@ WARNING: untranslated string: legacy architecture warning = You are running IPFi
WARNING: untranslated string: legend = Legend
WARNING: untranslated string: lifetime = Lifetime:
WARNING: untranslated string: linkq = Link Quality
-WARNING: untranslated string: load printer = Load Printer
WARNING: untranslated string: local ip address = Local IP Address
-WARNING: untranslated string: local master = Local Master
WARNING: untranslated string: local ntp server specified but not enabled = Local NTP server specified but not enabled
WARNING: untranslated string: local subnet = Local subnet:
WARNING: untranslated string: local subnet is invalid = Local subnet is invalid.
@@ -1202,14 +1174,12 @@ WARNING: untranslated string: locationblock country is allowed = Incoming traffi
WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked
WARNING: untranslated string: locationblock enable feature = Enable Location based blocking:
WARNING: untranslated string: log = Log
-WARNING: untranslated string: log level = Log Level
WARNING: untranslated string: log lines per page = Lines per page
WARNING: untranslated string: log server address = Syslog server:
WARNING: untranslated string: log server protocol = protocol:
WARNING: untranslated string: log settings = Log Settings
WARNING: untranslated string: log summaries = Log summaries
WARNING: untranslated string: log summary = Log Summary
-WARNING: untranslated string: log view = Log View
WARNING: untranslated string: log viewing options = Log viewing options
WARNING: untranslated string: log-options = Logfile options
WARNING: untranslated string: loged in at = Logged in at
@@ -1237,7 +1207,6 @@ WARNING: untranslated string: mac1 new = new MAC address 1 (vdsl-inet):
WARNING: untranslated string: mac2 new = new MAC address 2 (vdsl-iptv):
WARNING: untranslated string: magic packet send to: = Magic packet send to:
WARNING: untranslated string: main page = Main page
-WARNING: untranslated string: manage printers = manage printers
WARNING: untranslated string: manage shares = Manage Shares
WARNING: untranslated string: manually = Manually
WARNING: untranslated string: map to guest = Map to Guest
@@ -1264,7 +1233,6 @@ WARNING: untranslated string: mbmon label = Label
WARNING: untranslated string: mbmon settings = mbmongraph settings
WARNING: untranslated string: mbmon temp = Temperature
WARNING: untranslated string: mbmon volt = Voltage
-WARNING: untranslated string: meaning = meaning
WARNING: untranslated string: media = Media
WARNING: untranslated string: media information = Media information
WARNING: untranslated string: medium = Medium
@@ -1305,7 +1273,6 @@ WARNING: untranslated string: monday = Monday
WARNING: untranslated string: monitor interface = Monitor Interface
WARNING: untranslated string: month = Month
WARNING: untranslated string: months = Months
-WARNING: untranslated string: more = more
WARNING: untranslated string: most preferred = most preferred
WARNING: untranslated string: mounted on = Mounted on
WARNING: untranslated string: mpfire = Media Player for IPFire
@@ -1316,7 +1283,6 @@ WARNING: untranslated string: mpfire search = MPFire Search
WARNING: untranslated string: mpfire songs = MPFire songlist
WARNING: untranslated string: mpfire webradio = MPFire Webradio
WARNING: untranslated string: mtu = MTU
-WARNING: untranslated string: my new share = My new share
WARNING: untranslated string: name = Name
WARNING: untranslated string: name is invalid = Name is invalid
WARNING: untranslated string: name must only contain characters = Name must only contain characters.
@@ -1325,7 +1291,7 @@ WARNING: untranslated string: nameserver = Nameserver
WARNING: untranslated string: needreboot = An update requires a restart
WARNING: untranslated string: net config = Network configuration
WARNING: untranslated string: net to net vpn = Net-to-Net Virtual Private Network
-WARNING: untranslated string: netbios name = Netbios Name
+WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
WARNING: untranslated string: netmask = Netmask
WARNING: untranslated string: network = Network
WARNING: untranslated string: network internal = Network (internal)
@@ -1344,7 +1310,6 @@ WARNING: untranslated string: no data = unknown string
WARNING: untranslated string: no dhcp lease = No DHCP lease has been acquired
WARNING: untranslated string: no entries = No entries at the moment.
WARNING: untranslated string: no filter pass = Enter the standard class for non-filtered packets.
-WARNING: untranslated string: no log selected = No log selected
WARNING: untranslated string: no time limit = unlimited time
WARNING: untranslated string: none = none
WARNING: untranslated string: none found = none found
@@ -1354,7 +1319,6 @@ WARNING: untranslated string: not affected = Not Affected
WARNING: untranslated string: not enough disk space = Not enough disk space
WARNING: untranslated string: not present = <b>Not</b> present
WARNING: untranslated string: not running = not running
-WARNING: untranslated string: not set = not set
WARNING: untranslated string: not validating = Not validating
WARNING: untranslated string: notice = Notice
WARNING: untranslated string: november = November
@@ -1393,6 +1357,7 @@ WARNING: untranslated string: openvpn prefix openvpn subnet = Using the prefix n
WARNING: untranslated string: openvpn prefix remote subnet = Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0.
WARNING: untranslated string: openvpn server = OpenVPN server
WARNING: untranslated string: openvpn subnet is used = The given subnet is used by another OpenVPN server.
+WARNING: untranslated string: optional = Optional
WARNING: untranslated string: optional at cmd = optional AT command
WARNING: untranslated string: options = Options
WARNING: untranslated string: options fw = Firewall Options
@@ -1400,7 +1365,6 @@ WARNING: untranslated string: orange = ORANGE
WARNING: untranslated string: organization cant be empty = Organization can't be empty.
WARNING: untranslated string: organization name = Organization Name
WARNING: untranslated string: organization too long = Organization is too long; it should not be longer than 60 characters.
-WARNING: untranslated string: os level = OS Level
WARNING: untranslated string: other countries = Other countries
WARNING: untranslated string: other login script = Other login script
WARNING: untranslated string: otherip = other IP
@@ -1475,10 +1439,6 @@ WARNING: untranslated string: password = Password:
WARNING: untranslated string: password not set = Password not set.
WARNING: untranslated string: password too short = Password is too short.
WARNING: untranslated string: passwords do not match = Passwords do not match.
-WARNING: untranslated string: path to directory = path to share
-WARNING: untranslated string: pc = Workstation
-WARNING: untranslated string: pc add = Add workstation
-WARNING: untranslated string: pdc options = PDC options
WARNING: untranslated string: percentage = Percentage
WARNING: untranslated string: persistent = Persistent
WARNING: untranslated string: pfs yes no = Perfect Forward Secrecy (PFS)
@@ -1495,16 +1455,10 @@ WARNING: untranslated string: pptp peer = Peer
WARNING: untranslated string: pptp route = PPTP Route
WARNING: untranslated string: pptp settings = Additional PPTP settings:
WARNING: untranslated string: pre-shared key is too short = Pre-shared key is too short.
-WARNING: untranslated string: prefered master = Prefered Master
WARNING: untranslated string: prev = previous
WARNING: untranslated string: primary dns = Primary DNS:
WARNING: untranslated string: primary ntp server = Primary NTP server
WARNING: untranslated string: primary wins server address = Primary WINS server address
-WARNING: untranslated string: printcap name = Printercap name
-WARNING: untranslated string: printer = Printer
-WARNING: untranslated string: printername = Printername
-WARNING: untranslated string: printing = Printing
-WARNING: untranslated string: printing options = printing options
WARNING: untranslated string: priority = Priority
WARNING: untranslated string: processes = Processes
WARNING: untranslated string: processor vulnerability mitigations = Processor Vulnerability Mitigations
@@ -1540,7 +1494,6 @@ WARNING: untranslated string: ram = RAM
WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon
WARNING: untranslated string: rdns = rDNS
WARNING: untranslated string: read bytes = Bytes Read
-WARNING: untranslated string: read list = list with readonly hosts
WARNING: untranslated string: real address = Real Address
WARNING: untranslated string: reboot = Reboot
WARNING: untranslated string: rebooting = Rebooting
@@ -1569,17 +1522,14 @@ WARNING: untranslated string: remove ca certificate = Remove CA certificate
WARNING: untranslated string: remove x509 = Remove x509
WARNING: untranslated string: repeat = Repeat
WARNING: untranslated string: request = Request
+WARNING: untranslated string: required = Required
WARNING: untranslated string: required field = Required field
WARNING: untranslated string: reset = Reset
-WARNING: untranslated string: reset shares = Reset share
-WARNING: untranslated string: resetglobals = Reset global settings
-WARNING: untranslated string: resetshares = Reset shares?
WARNING: untranslated string: resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections = Resetting the X509 remove the root CA, the host certificate and all certificate based connections.
WARNING: untranslated string: restart = Restart
WARNING: untranslated string: restart ovpn server = Restart OpenVPN server
WARNING: untranslated string: restore = Restore
WARNING: untranslated string: restore defaults = Restore defaults
-WARNING: untranslated string: restore settings = Reset Settings
WARNING: untranslated string: reverse sort = Sort in reverse chronological order
WARNING: untranslated string: root certificate = Root Certificate
WARNING: untranslated string: route config changed = unknown string
@@ -1591,11 +1541,10 @@ WARNING: untranslated string: running = RUNNING
WARNING: untranslated string: samba = Samba
WARNING: untranslated string: samba join a domain = Join a domain
WARNING: untranslated string: samba join domain = Join domain
-WARNING: untranslated string: samba status = Samba Status
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: saturday = Saturday
WARNING: untranslated string: save = Save
-WARNING: untranslated string: save config = save settings
-WARNING: untranslated string: save settings = Save settings
WARNING: untranslated string: save-adv-options = Save advanced options
WARNING: untranslated string: script name = Script name:
WARNING: untranslated string: search = Search
@@ -1613,11 +1562,9 @@ WARNING: untranslated string: sent = Sent
WARNING: untranslated string: september = September
WARNING: untranslated string: serial = Serial
WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
-WARNING: untranslated string: server string = Server String
WARNING: untranslated string: service = Service
WARNING: untranslated string: service name = Service name:
WARNING: untranslated string: services = Services
-WARNING: untranslated string: set = set
WARNING: untranslated string: set time now = Set time now
WARNING: untranslated string: set time now help = To queue a synchronization event at any time (even while using a repeating schedule), press the <i>Set time now</i> button. Please note that you may have to wait for five minutes, or more, before a sync event occurs.
WARNING: untranslated string: settings = Settings
@@ -1630,9 +1577,7 @@ WARNING: untranslated string: show certificate = Show file
WARNING: untranslated string: show crl = Show certificate revocation list
WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
WARNING: untranslated string: show host certificate = Show host certificate
-WARNING: untranslated string: show last x lines = Show last x lines
WARNING: untranslated string: show root certificate = Show root certificate
-WARNING: untranslated string: show share options = Show shares options
WARNING: untranslated string: show tls-auth key = Show tls-auth key
WARNING: untranslated string: shuffle = Shuffle
WARNING: untranslated string: shutdown = Shutdown
@@ -1644,14 +1589,11 @@ WARNING: untranslated string: size = Size
WARNING: untranslated string: smart information = S.M.A.R.T. information
WARNING: untranslated string: smartwarn1 = Device:
WARNING: untranslated string: smartwarn2 = reports S.M.A.R.T. error
-WARNING: untranslated string: smbrestart = Restart samba
-WARNING: untranslated string: smbstart = Start samba
-WARNING: untranslated string: smbstop = Stop samba
+WARNING: untranslated string: smb daemon = SMB Daemon
WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled
WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported
WARNING: untranslated string: snat new source ip address = New source IP address
-WARNING: untranslated string: socket options = Socket options
WARNING: untranslated string: software version = Software Version
WARNING: untranslated string: sort ascending = Sort ascending
WARNING: untranslated string: sort descending = Sort descending
@@ -1804,9 +1746,7 @@ WARNING: untranslated string: unblock = Unblock
WARNING: untranslated string: unblock all = Unblock all
WARNING: untranslated string: uncheck all = Uncheck all
WARNING: untranslated string: uninstall = Uninstall
-WARNING: untranslated string: unix charset = UNIX Charset
WARNING: untranslated string: unix group = UNIX usergroup
-WARNING: untranslated string: unix password sync = Unix Password Sync
WARNING: untranslated string: unix shell = UNIX Shell
WARNING: untranslated string: unknown = UNKNOWN
WARNING: untranslated string: unlimited = Unlimited
@@ -2089,6 +2029,7 @@ WARNING: untranslated string: used memory = Used Memory
WARNING: untranslated string: used swap = Used Swap
WARNING: untranslated string: user = User
WARNING: untranslated string: user log = user log
+WARNING: untranslated string: user management = User Management
WARNING: untranslated string: user proxy logs = user proxy log
WARNING: untranslated string: username = Username:
WARNING: untranslated string: username not set = Username not set.
@@ -2101,7 +2042,6 @@ WARNING: untranslated string: vci number = VCI number:
WARNING: untranslated string: vendor = Vendor
WARNING: untranslated string: virtual address = Virtual Address
WARNING: untranslated string: virtual private networking = Virtual Private Networking
-WARNING: untranslated string: visible in browselist = visible in browselist
WARNING: untranslated string: visit us at = Visit us at
WARNING: untranslated string: voldown10 = Decrease volume by 10
WARNING: untranslated string: voldown5 = Decrease volume by 5
@@ -2146,8 +2086,7 @@ WARNING: untranslated string: website = Website
WARNING: untranslated string: wednesday = Wednesday
WARNING: untranslated string: week = Week
WARNING: untranslated string: weeks = Weeks
-WARNING: untranslated string: wins server = Wins Server
-WARNING: untranslated string: wins support = Wins Support
+WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wireless = Wireless
WARNING: untranslated string: wireless config added = Wireless config added
WARNING: untranslated string: wireless config changed = Wireless config changed
diff --git a/doc/language_issues.es b/doc/language_issues.es
index e8b39de69..689eeca7c 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -14,15 +14,22 @@ WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Verbose
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
+WARNING: translation string unused: accounting
+WARNING: translation string unused: accounting user nonpdc
+WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
+WARNING: translation string unused: active
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
WARNING: translation string unused: add new ovpn
+WARNING: translation string unused: add printer
WARNING: translation string unused: add service
WARNING: translation string unused: add subclass
WARNING: translation string unused: add xtaccess
WARNING: translation string unused: add-route
WARNING: translation string unused: admin user password has been changed
+WARNING: translation string unused: admin users
WARNING: translation string unused: administrator user password
WARNING: translation string unused: advproxy LDAP auth
WARNING: translation string unused: advproxy NTLM BDC hostname
@@ -126,11 +133,14 @@ WARNING: translation string unused: cannot enable both nat traversal and compres
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: choose media
WARNING: translation string unused: class in use
WARNING: translation string unused: clear cache
+WARNING: translation string unused: client
+WARNING: translation string unused: comment
WARNING: translation string unused: compression
WARNING: translation string unused: connect
WARNING: translation string unused: connect the modem
@@ -147,6 +157,7 @@ WARNING: translation string unused: could not open available updates file
WARNING: translation string unused: could not open installed updates file
WARNING: translation string unused: could not open update information file
WARNING: translation string unused: create
+WARNING: translation string unused: create mask
WARNING: translation string unused: create new backup
WARNING: translation string unused: current dynamic leases
WARNING: translation string unused: current media
@@ -163,12 +174,16 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
WARNING: translation string unused: destination ip or net
@@ -184,8 +199,11 @@ WARNING: translation string unused: dhcp server enabled on blue interface
WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
+WARNING: translation string unused: directory mask
+WARNING: translation string unused: directory writeable
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
+WARNING: translation string unused: display charset
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -209,9 +227,11 @@ WARNING: translation string unused: dns saved
WARNING: translation string unused: dns saved txt
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: domain master
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
+WARNING: translation string unused: dos charset
WARNING: translation string unused: download new ruleset
WARNING: translation string unused: driver
WARNING: translation string unused: drop output
@@ -222,6 +242,7 @@ WARNING: translation string unused: eciadsl help
WARNING: translation string unused: eciadsl upload
WARNING: translation string unused: edit a rule
WARNING: translation string unused: edit network
+WARNING: translation string unused: edit printer
WARNING: translation string unused: edit service
WARNING: translation string unused: editor
WARNING: translation string unused: eg
@@ -247,6 +268,7 @@ WARNING: translation string unused: esp encryption
WARNING: translation string unused: esp grouptype
WARNING: translation string unused: esp integrity
WARNING: translation string unused: esp keylife
+WARNING: translation string unused: exampel
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
@@ -264,6 +286,7 @@ WARNING: translation string unused: firewall log viewer
WARNING: translation string unused: firmware
WARNING: translation string unused: firmware upload
WARNING: translation string unused: force update
+WARNING: translation string unused: force user
WARNING: translation string unused: forwarding rule added
WARNING: translation string unused: forwarding rule removed
WARNING: translation string unused: forwarding rule updated
@@ -285,11 +308,14 @@ WARNING: translation string unused: generatepolicy
WARNING: translation string unused: generatereport
WARNING: translation string unused: genkey
WARNING: translation string unused: green interface
+WARNING: translation string unused: guest ok
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
+WARNING: translation string unused: host allow
WARNING: translation string unused: host configuration
+WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
@@ -309,6 +335,7 @@ WARNING: translation string unused: ike lifetime
WARNING: translation string unused: import
WARNING: translation string unused: importkey
WARNING: translation string unused: in
+WARNING: translation string unused: inactive
WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
@@ -316,6 +343,7 @@ WARNING: translation string unused: insert removable device
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
+WARNING: translation string unused: interfaces
WARNING: translation string unused: intrusion detection system log viewer
WARNING: translation string unused: intrusion detection system2
WARNING: translation string unused: invalid cache size
@@ -327,6 +355,7 @@ WARNING: translation string unused: invalid port list
WARNING: translation string unused: invalid time entered
WARNING: translation string unused: invalid uplink speed
WARNING: translation string unused: invalid upstream proxy username or password setting
+WARNING: translation string unused: invalid users
WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
@@ -345,15 +374,19 @@ WARNING: translation string unused: lang
WARNING: translation string unused: lateprompting
WARNING: translation string unused: length
WARNING: translation string unused: line
+WARNING: translation string unused: load printer
WARNING: translation string unused: loaded modules
WARNING: translation string unused: local hard disk
+WARNING: translation string unused: local master
WARNING: translation string unused: localkey
WARNING: translation string unused: localkeyfile
WARNING: translation string unused: locationblock country code
WARNING: translation string unused: locationblock country name
WARNING: translation string unused: locationblock flag
WARNING: translation string unused: log enabled
+WARNING: translation string unused: log level
WARNING: translation string unused: log var messages
+WARNING: translation string unused: log view
WARNING: translation string unused: log viewer
WARNING: translation string unused: logging
WARNING: translation string unused: loosedirectorychecking
@@ -371,6 +404,7 @@ WARNING: translation string unused: mac address error not 00
WARNING: translation string unused: mailmethod
WARNING: translation string unused: mailprogramm
WARNING: translation string unused: manage ovpn
+WARNING: translation string unused: manage printers
WARNING: translation string unused: manual
WARNING: translation string unused: manual control and status
WARNING: translation string unused: marked
@@ -381,6 +415,7 @@ WARNING: translation string unused: mbmon fan in
WARNING: translation string unused: mbmon graphs
WARNING: translation string unused: mbmon temp in
WARNING: translation string unused: mbmon value
+WARNING: translation string unused: meaning
WARNING: translation string unused: messages logging
WARNING: translation string unused: min size
WARNING: translation string unused: missing dat
@@ -398,8 +433,10 @@ WARNING: translation string unused: monthly traffic bad
WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
+WARNING: translation string unused: more
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
+WARNING: translation string unused: my new share
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net
WARNING: translation string unused: net address
@@ -407,6 +444,7 @@ WARNING: translation string unused: net config type
WARNING: translation string unused: net config type help
WARNING: translation string unused: net traffic newversion
WARNING: translation string unused: net-traffic configuration
+WARNING: translation string unused: netbios name
WARNING: translation string unused: network added
WARNING: translation string unused: network configuration
WARNING: translation string unused: network removed
@@ -421,10 +459,12 @@ WARNING: translation string unused: no cfg upload
WARNING: translation string unused: no eciadsl synch.bin file
WARNING: translation string unused: no fritzdsl driver
WARNING: translation string unused: no information available
+WARNING: translation string unused: no log selected
WARNING: translation string unused: no modem selected
WARNING: translation string unused: no set selected
WARNING: translation string unused: nonetworkname
WARNING: translation string unused: noservicename
+WARNING: translation string unused: not set
WARNING: translation string unused: notes
WARNING: translation string unused: o-no
WARNING: translation string unused: o-yes
@@ -436,6 +476,7 @@ WARNING: translation string unused: optionsfw portlist hint
WARNING: translation string unused: optionsfw warning
WARNING: translation string unused: or
WARNING: translation string unused: original
+WARNING: translation string unused: os level
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall mode0
@@ -475,6 +516,10 @@ WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
+WARNING: translation string unused: path to directory
+WARNING: translation string unused: pc
+WARNING: translation string unused: pc add
+WARNING: translation string unused: pdc options
WARNING: translation string unused: phase1 group
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
@@ -483,7 +528,13 @@ WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
+WARNING: translation string unused: prefered master
WARNING: translation string unused: present
+WARNING: translation string unused: printcap name
+WARNING: translation string unused: printer
+WARNING: translation string unused: printername
+WARNING: translation string unused: printing
+WARNING: translation string unused: printing options
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
@@ -493,6 +544,7 @@ WARNING: translation string unused: proxy port
WARNING: translation string unused: psk
WARNING: translation string unused: qos add subclass
WARNING: translation string unused: quick control
+WARNING: translation string unused: read list
WARNING: translation string unused: reboot ask
WARNING: translation string unused: reboot question
WARNING: translation string unused: reboot schedule
@@ -505,8 +557,12 @@ WARNING: translation string unused: reportlevel
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
+WARNING: translation string unused: reset shares
+WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
+WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -516,7 +572,10 @@ WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -524,25 +583,33 @@ WARNING: translation string unused: selecttraffic
WARNING: translation string unused: send email notification
WARNING: translation string unused: send test mail
WARNING: translation string unused: server reserved
+WARNING: translation string unused: server string
WARNING: translation string unused: service added
WARNING: translation string unused: service removed
WARNING: translation string unused: service updated
WARNING: translation string unused: servicename
WARNING: translation string unused: services settings
+WARNING: translation string unused: set
WARNING: translation string unused: shaping add options
WARNING: translation string unused: shaping list options
WARNING: translation string unused: show areas
+WARNING: translation string unused: show last x lines
WARNING: translation string unused: show lines
+WARNING: translation string unused: show share options
WARNING: translation string unused: shutdown ask
WARNING: translation string unused: shutdown sure
WARNING: translation string unused: shutdown2
WARNING: translation string unused: sitekey
WARNING: translation string unused: sitekeyfile
WARNING: translation string unused: smbreload
+WARNING: translation string unused: smbrestart
+WARNING: translation string unused: smbstart
+WARNING: translation string unused: smbstop
WARNING: translation string unused: smtphost
WARNING: translation string unused: smtpport
WARNING: translation string unused: snort hits
WARNING: translation string unused: snort working
+WARNING: translation string unused: socket options
WARNING: translation string unused: source ip bad
WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
@@ -622,6 +689,8 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: unix charset
+WARNING: translation string unused: unix password sync
WARNING: translation string unused: update transcript
WARNING: translation string unused: updatedatabase
WARNING: translation string unused: updates
@@ -656,6 +725,7 @@ WARNING: translation string unused: use
WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
+WARNING: translation string unused: visible in browselist
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn configuration main
WARNING: translation string unused: vpn delayed start
@@ -672,6 +742,8 @@ WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
+WARNING: translation string unused: wins server
+WARNING: translation string unused: wins support
WARNING: translation string unused: wlanap access point
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
@@ -805,6 +877,7 @@ WARNING: untranslated string: dangerous = Dangerous
WARNING: untranslated string: dead peer detection = Dead Peer Detection
WARNING: untranslated string: default = Default
WARNING: untranslated string: default IP address = Default IP Address
+WARNING: untranslated string: desired = Desired
WARNING: untranslated string: details = Details
WARNING: untranslated string: dh = Diffie-Hellman parameters
WARNING: untranslated string: dh key move failed = Diffie-Hellman parameters move failed.
@@ -816,6 +889,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name
WARNING: untranslated string: dhcp dns update = DNS Update
WARNING: untranslated string: dhcp dns update algo = Algorithm
WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: disable = Disable
WARNING: untranslated string: disconnected = Disconnected
WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
WARNING: untranslated string: dnat address = Firewall Interface
@@ -877,6 +951,7 @@ WARNING: untranslated string: email tls implicit = implicit (TLS)
WARNING: untranslated string: email usemail = Activate Mail Service
WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules
+WARNING: untranslated string: enable = Enable
WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
WARNING: untranslated string: encryption = Encryption:
WARNING: untranslated string: entropy = Entropy
@@ -1189,6 +1264,7 @@ WARNING: untranslated string: monitor interface = Monitor Interface
WARNING: untranslated string: most preferred = most preferred
WARNING: untranslated string: mtu = MTU
WARNING: untranslated string: nameserver = Nameserver
+WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
WARNING: untranslated string: no data = unknown string
WARNING: untranslated string: no entries = No entries at the moment.
WARNING: untranslated string: none = none
@@ -1210,6 +1286,7 @@ WARNING: untranslated string: openvpn prefix local subnet = Using the prefix not
WARNING: untranslated string: openvpn prefix openvpn subnet = Using the prefix notation is not supported for the OpenVPN subnet. Please enter a subnet mask like 255.255.255.0.
WARNING: untranslated string: openvpn prefix remote subnet = Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0.
WARNING: untranslated string: openvpn subnet is used = The given subnet is used by another OpenVPN server.
+WARNING: untranslated string: optional = Optional
WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
WARNING: untranslated string: outgoing firewall access = Outgoing Firewall Access
WARNING: untranslated string: outgoing firewall p2p allow = Using the P2P protocol is allowed
@@ -1260,6 +1337,7 @@ WARNING: untranslated string: random number generator daemon = Random Number Gen
WARNING: untranslated string: rdns = rDNS
WARNING: untranslated string: received = Received
WARNING: untranslated string: red1 = RED
+WARNING: untranslated string: required = Required
WARNING: untranslated string: required field = Required field
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
@@ -1267,11 +1345,14 @@ WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: routing table = unknown string
WARNING: untranslated string: samba join a domain = Join a domain
WARNING: untranslated string: samba join domain = Join domain
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: search = Search
WARNING: untranslated string: sent = Sent
WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
WARNING: untranslated string: show tls-auth key = Show tls-auth key
+WARNING: untranslated string: smb daemon = SMB Daemon
WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled
WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported
@@ -1363,6 +1444,7 @@ WARNING: untranslated string: uplink bit rate = Uplink Bit Rate
WARNING: untranslated string: upload dh key = Upload Diffie-Hellman parameters
WARNING: untranslated string: uptime load average = Load average
WARNING: untranslated string: urlfilter redirect template = Redirect page template
+WARNING: untranslated string: user management = User Management
WARNING: untranslated string: vendor = Vendor
WARNING: untranslated string: visit us at = Visit us at
WARNING: untranslated string: vpn broken = Broken
@@ -1383,6 +1465,7 @@ WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wireless network = WiFi Network
WARNING: untranslated string: wlan client = Wireless client
WARNING: untranslated string: wlan client advanced settings = Advanced settings
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 9c7456d71..632acf938 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -39,16 +39,23 @@ WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Verbose
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
+WARNING: translation string unused: accounting
+WARNING: translation string unused: accounting user nonpdc
+WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
+WARNING: translation string unused: active
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
WARNING: translation string unused: add new ovpn
+WARNING: translation string unused: add printer
WARNING: translation string unused: add service
WARNING: translation string unused: add subclass
WARNING: translation string unused: add xtaccess
WARNING: translation string unused: add-route
WARNING: translation string unused: addon
WARNING: translation string unused: admin user password has been changed
+WARNING: translation string unused: admin users
WARNING: translation string unused: administrator user password
WARNING: translation string unused: adsl settings
WARNING: translation string unused: advproxy AUTH method ntlm
@@ -158,11 +165,14 @@ WARNING: translation string unused: ccd err iroute
WARNING: translation string unused: ccd err netadr
WARNING: translation string unused: ccd maxclients
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: choose media
WARNING: translation string unused: class in use
WARNING: translation string unused: clear cache
+WARNING: translation string unused: client
+WARNING: translation string unused: comment
WARNING: translation string unused: compression
WARNING: translation string unused: connect
WARNING: translation string unused: connect the modem
@@ -179,6 +189,7 @@ WARNING: translation string unused: could not open available updates file
WARNING: translation string unused: could not open installed updates file
WARNING: translation string unused: could not open update information file
WARNING: translation string unused: create
+WARNING: translation string unused: create mask
WARNING: translation string unused: create new backup
WARNING: translation string unused: cryptographic settings
WARNING: translation string unused: current dynamic leases
@@ -196,6 +207,7 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
@@ -203,6 +215,9 @@ WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: deprecated fs warn
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
@@ -220,8 +235,11 @@ WARNING: translation string unused: dhcp server enabled on blue interface
WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
+WARNING: translation string unused: directory mask
+WARNING: translation string unused: directory writeable
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
+WARNING: translation string unused: display charset
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -248,9 +266,11 @@ WARNING: translation string unused: dns server
WARNING: translation string unused: dns servers
WARNING: translation string unused: dnssec information
WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: domain master
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
+WARNING: translation string unused: dos charset
WARNING: translation string unused: download dh parameter
WARNING: translation string unused: download new ruleset
WARNING: translation string unused: driver
@@ -261,6 +281,7 @@ WARNING: translation string unused: eciadsl help
WARNING: translation string unused: eciadsl upload
WARNING: translation string unused: edit a rule
WARNING: translation string unused: edit network
+WARNING: translation string unused: edit printer
WARNING: translation string unused: edit service
WARNING: translation string unused: editor
WARNING: translation string unused: eg
@@ -290,6 +311,7 @@ WARNING: translation string unused: esp encryption
WARNING: translation string unused: esp grouptype
WARNING: translation string unused: esp integrity
WARNING: translation string unused: esp keylife
+WARNING: translation string unused: exampel
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
@@ -305,6 +327,7 @@ WARNING: translation string unused: filename
WARNING: translation string unused: firmware
WARNING: translation string unused: firmware upload
WARNING: translation string unused: force update
+WARNING: translation string unused: force user
WARNING: translation string unused: forward firewall
WARNING: translation string unused: forwarding rule added
WARNING: translation string unused: forwarding rule removed
@@ -368,11 +391,14 @@ WARNING: translation string unused: generatepolicy
WARNING: translation string unused: generatereport
WARNING: translation string unused: genkey
WARNING: translation string unused: green interface
+WARNING: translation string unused: guest ok
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
+WARNING: translation string unused: host allow
WARNING: translation string unused: host configuration
+WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
@@ -387,6 +413,7 @@ WARNING: translation string unused: ike lifetime
WARNING: translation string unused: import
WARNING: translation string unused: importkey
WARNING: translation string unused: in
+WARNING: translation string unused: inactive
WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
@@ -394,6 +421,7 @@ WARNING: translation string unused: insert removable device
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
+WARNING: translation string unused: interfaces
WARNING: translation string unused: intrusion detection system log viewer
WARNING: translation string unused: intrusion detection system2
WARNING: translation string unused: intrusion prevention system
@@ -406,6 +434,7 @@ WARNING: translation string unused: invalid port list
WARNING: translation string unused: invalid time entered
WARNING: translation string unused: invalid uplink speed
WARNING: translation string unused: invalid upstream proxy username or password setting
+WARNING: translation string unused: invalid users
WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
@@ -425,15 +454,19 @@ WARNING: translation string unused: lang
WARNING: translation string unused: lateprompting
WARNING: translation string unused: length
WARNING: translation string unused: line
+WARNING: translation string unused: load printer
WARNING: translation string unused: loaded modules
WARNING: translation string unused: local hard disk
+WARNING: translation string unused: local master
WARNING: translation string unused: localkey
WARNING: translation string unused: localkeyfile
WARNING: translation string unused: locationblock country code
WARNING: translation string unused: locationblock country name
WARNING: translation string unused: locationblock flag
WARNING: translation string unused: log enabled
+WARNING: translation string unused: log level
WARNING: translation string unused: log var messages
+WARNING: translation string unused: log view
WARNING: translation string unused: log viewer
WARNING: translation string unused: logging
WARNING: translation string unused: loosedirectorychecking
@@ -451,6 +484,7 @@ WARNING: translation string unused: mac address error not 00
WARNING: translation string unused: mailmethod
WARNING: translation string unused: mailprogramm
WARNING: translation string unused: manage ovpn
+WARNING: translation string unused: manage printers
WARNING: translation string unused: manual
WARNING: translation string unused: manual control and status
WARNING: translation string unused: marked
@@ -461,6 +495,7 @@ WARNING: translation string unused: mbmon fan in
WARNING: translation string unused: mbmon graphs
WARNING: translation string unused: mbmon temp in
WARNING: translation string unused: mbmon value
+WARNING: translation string unused: meaning
WARNING: translation string unused: messages logging
WARNING: translation string unused: min size
WARNING: translation string unused: missing dat
@@ -478,8 +513,10 @@ WARNING: translation string unused: monthly traffic bad
WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
+WARNING: translation string unused: more
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
+WARNING: translation string unused: my new share
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net
WARNING: translation string unused: net address
@@ -487,6 +524,7 @@ WARNING: translation string unused: net config type
WARNING: translation string unused: net config type help
WARNING: translation string unused: net traffic newversion
WARNING: translation string unused: net-traffic configuration
+WARNING: translation string unused: netbios name
WARNING: translation string unused: network added
WARNING: translation string unused: network configuration
WARNING: translation string unused: network removed
@@ -503,10 +541,12 @@ WARNING: translation string unused: no eciadsl synch.bin file
WARNING: translation string unused: no fritzdsl driver
WARNING: translation string unused: no hardware random number generator
WARNING: translation string unused: no information available
+WARNING: translation string unused: no log selected
WARNING: translation string unused: no modem selected
WARNING: translation string unused: no set selected
WARNING: translation string unused: nonetworkname
WARNING: translation string unused: noservicename
+WARNING: translation string unused: not set
WARNING: translation string unused: notes
WARNING: translation string unused: o-no
WARNING: translation string unused: o-yes
@@ -521,6 +561,7 @@ WARNING: translation string unused: optionsfw portlist hint
WARNING: translation string unused: optionsfw warning
WARNING: translation string unused: or
WARNING: translation string unused: original
+WARNING: translation string unused: os level
WARNING: translation string unused: other
WARNING: translation string unused: our donors
WARNING: translation string unused: out
@@ -582,6 +623,10 @@ WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
+WARNING: translation string unused: path to directory
+WARNING: translation string unused: pc
+WARNING: translation string unused: pc add
+WARNING: translation string unused: pdc options
WARNING: translation string unused: phase1 group
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
@@ -590,7 +635,13 @@ WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
+WARNING: translation string unused: prefered master
WARNING: translation string unused: present
+WARNING: translation string unused: printcap name
+WARNING: translation string unused: printer
+WARNING: translation string unused: printername
+WARNING: translation string unused: printing
+WARNING: translation string unused: printing options
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
@@ -600,6 +651,7 @@ WARNING: translation string unused: proxy port
WARNING: translation string unused: psk
WARNING: translation string unused: qos add subclass
WARNING: translation string unused: quick control
+WARNING: translation string unused: read list
WARNING: translation string unused: reboot ask
WARNING: translation string unused: reboot question
WARNING: translation string unused: reboot schedule
@@ -612,8 +664,12 @@ WARNING: translation string unused: reportlevel
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
+WARNING: translation string unused: reset shares
+WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
+WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -624,7 +680,10 @@ WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: runmode
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -632,23 +691,31 @@ WARNING: translation string unused: selecttraffic
WARNING: translation string unused: send email notification
WARNING: translation string unused: send test mail
WARNING: translation string unused: server reserved
+WARNING: translation string unused: server string
WARNING: translation string unused: service added
WARNING: translation string unused: service removed
WARNING: translation string unused: service updated
WARNING: translation string unused: servicename
WARNING: translation string unused: services settings
+WARNING: translation string unused: set
WARNING: translation string unused: shaping add options
WARNING: translation string unused: shaping list options
WARNING: translation string unused: show areas
+WARNING: translation string unused: show last x lines
WARNING: translation string unused: show lines
+WARNING: translation string unused: show share options
WARNING: translation string unused: shutdown ask
WARNING: translation string unused: shutdown sure
WARNING: translation string unused: shutdown2
WARNING: translation string unused: sitekey
WARNING: translation string unused: sitekeyfile
WARNING: translation string unused: smbreload
+WARNING: translation string unused: smbrestart
+WARNING: translation string unused: smbstart
+WARNING: translation string unused: smbstop
WARNING: translation string unused: smtphost
WARNING: translation string unused: smtpport
+WARNING: translation string unused: socket options
WARNING: translation string unused: source ip bad
WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
@@ -737,6 +804,8 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: unix charset
+WARNING: translation string unused: unix password sync
WARNING: translation string unused: update transcript
WARNING: translation string unused: updatedatabase
WARNING: translation string unused: updates
@@ -774,6 +843,7 @@ WARNING: translation string unused: use
WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
+WARNING: translation string unused: visible in browselist
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn configuration main
WARNING: translation string unused: vpn delayed start
@@ -790,6 +860,8 @@ WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
+WARNING: translation string unused: wins server
+WARNING: translation string unused: wins support
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
@@ -807,6 +879,9 @@ WARNING: translation string unused: zoneconf val ppp assignment error
WARNING: translation string unused: zoneconf val vlan amount assignment error
WARNING: translation string unused: zoneconf val vlan tag assignment error
WARNING: translation string unused: zoneconf val zoneslave amount error
+WARNING: untranslated string: desired = Desired
+WARNING: untranslated string: disable = Disable
+WARNING: untranslated string: enable = Enable
WARNING: untranslated string: fwhost cust locationgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
WARNING: untranslated string: guardian block a host = unknown string
@@ -838,7 +913,15 @@ WARNING: untranslated string: guardian logtarget_file = unknown string
WARNING: untranslated string: guardian logtarget_syslog = unknown string
WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
+WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
+WARNING: untranslated string: optional = Optional
WARNING: untranslated string: pakfire ago = ago.
+WARNING: untranslated string: required = Required
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
WARNING: untranslated string: routing config changed = unknown string
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
+WARNING: untranslated string: smb daemon = SMB Daemon
+WARNING: untranslated string: user management = User Management
+WARNING: untranslated string: winbind daemon = Winbind Daemon
diff --git a/doc/language_issues.it b/doc/language_issues.it
index d47aafa14..99a7f3e8d 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -15,15 +15,22 @@ WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Verbose
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
+WARNING: translation string unused: accounting
+WARNING: translation string unused: accounting user nonpdc
+WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
+WARNING: translation string unused: active
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
WARNING: translation string unused: add new ovpn
+WARNING: translation string unused: add printer
WARNING: translation string unused: add service
WARNING: translation string unused: add subclass
WARNING: translation string unused: add xtaccess
WARNING: translation string unused: add-route
WARNING: translation string unused: admin user password has been changed
+WARNING: translation string unused: admin users
WARNING: translation string unused: administrator user password
WARNING: translation string unused: advproxy AUTH method ntlm
WARNING: translation string unused: advproxy LDAP auth
@@ -134,11 +141,14 @@ WARNING: translation string unused: capsinactive
WARNING: translation string unused: ccd err iroute
WARNING: translation string unused: ccd err netadr
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: choose media
WARNING: translation string unused: class in use
WARNING: translation string unused: clear cache
+WARNING: translation string unused: client
+WARNING: translation string unused: comment
WARNING: translation string unused: compression
WARNING: translation string unused: connect
WARNING: translation string unused: connect the modem
@@ -155,6 +165,7 @@ WARNING: translation string unused: could not open available updates file
WARNING: translation string unused: could not open installed updates file
WARNING: translation string unused: could not open update information file
WARNING: translation string unused: create
+WARNING: translation string unused: create mask
WARNING: translation string unused: create new backup
WARNING: translation string unused: current dynamic leases
WARNING: translation string unused: current media
@@ -171,6 +182,7 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
@@ -178,6 +190,9 @@ WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: deprecated fs warn
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
@@ -195,8 +210,11 @@ WARNING: translation string unused: dhcp server enabled on blue interface
WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
+WARNING: translation string unused: directory mask
+WARNING: translation string unused: directory writeable
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
+WARNING: translation string unused: display charset
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -223,9 +241,11 @@ WARNING: translation string unused: dns servers
WARNING: translation string unused: dnsforward forward_server
WARNING: translation string unused: dnssec information
WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: domain master
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
+WARNING: translation string unused: dos charset
WARNING: translation string unused: download dh parameter
WARNING: translation string unused: download new ruleset
WARNING: translation string unused: driver
@@ -236,6 +256,7 @@ WARNING: translation string unused: eciadsl help
WARNING: translation string unused: eciadsl upload
WARNING: translation string unused: edit a rule
WARNING: translation string unused: edit network
+WARNING: translation string unused: edit printer
WARNING: translation string unused: edit service
WARNING: translation string unused: editor
WARNING: translation string unused: eg
@@ -261,6 +282,7 @@ WARNING: translation string unused: esp encryption
WARNING: translation string unused: esp grouptype
WARNING: translation string unused: esp integrity
WARNING: translation string unused: esp keylife
+WARNING: translation string unused: exampel
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
@@ -278,6 +300,7 @@ WARNING: translation string unused: firewall log viewer
WARNING: translation string unused: firmware
WARNING: translation string unused: firmware upload
WARNING: translation string unused: force update
+WARNING: translation string unused: force user
WARNING: translation string unused: forward firewall
WARNING: translation string unused: forwarding rule added
WARNING: translation string unused: forwarding rule removed
@@ -342,11 +365,14 @@ WARNING: translation string unused: generatepolicy
WARNING: translation string unused: generatereport
WARNING: translation string unused: genkey
WARNING: translation string unused: green interface
+WARNING: translation string unused: guest ok
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
+WARNING: translation string unused: host allow
WARNING: translation string unused: host configuration
+WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
@@ -366,6 +392,7 @@ WARNING: translation string unused: ike lifetime
WARNING: translation string unused: import
WARNING: translation string unused: importkey
WARNING: translation string unused: in
+WARNING: translation string unused: inactive
WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
@@ -373,6 +400,7 @@ WARNING: translation string unused: insert removable device
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
+WARNING: translation string unused: interfaces
WARNING: translation string unused: intrusion detection system log viewer
WARNING: translation string unused: intrusion detection system2
WARNING: translation string unused: invalid cache size
@@ -384,6 +412,7 @@ WARNING: translation string unused: invalid port list
WARNING: translation string unused: invalid time entered
WARNING: translation string unused: invalid uplink speed
WARNING: translation string unused: invalid upstream proxy username or password setting
+WARNING: translation string unused: invalid users
WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
@@ -403,12 +432,16 @@ WARNING: translation string unused: lang
WARNING: translation string unused: lateprompting
WARNING: translation string unused: length
WARNING: translation string unused: line
+WARNING: translation string unused: load printer
WARNING: translation string unused: loaded modules
WARNING: translation string unused: local hard disk
+WARNING: translation string unused: local master
WARNING: translation string unused: localkey
WARNING: translation string unused: localkeyfile
WARNING: translation string unused: log enabled
+WARNING: translation string unused: log level
WARNING: translation string unused: log var messages
+WARNING: translation string unused: log view
WARNING: translation string unused: log viewer
WARNING: translation string unused: logging
WARNING: translation string unused: loosedirectorychecking
@@ -426,6 +459,7 @@ WARNING: translation string unused: mac address error not 00
WARNING: translation string unused: mailmethod
WARNING: translation string unused: mailprogramm
WARNING: translation string unused: manage ovpn
+WARNING: translation string unused: manage printers
WARNING: translation string unused: manual
WARNING: translation string unused: manual control and status
WARNING: translation string unused: marked
@@ -436,6 +470,7 @@ WARNING: translation string unused: mbmon fan in
WARNING: translation string unused: mbmon graphs
WARNING: translation string unused: mbmon temp in
WARNING: translation string unused: mbmon value
+WARNING: translation string unused: meaning
WARNING: translation string unused: messages logging
WARNING: translation string unused: min size
WARNING: translation string unused: missing dat
@@ -453,8 +488,10 @@ WARNING: translation string unused: monthly traffic bad
WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
+WARNING: translation string unused: more
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
+WARNING: translation string unused: my new share
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net
WARNING: translation string unused: net address
@@ -462,6 +499,7 @@ WARNING: translation string unused: net config type
WARNING: translation string unused: net config type help
WARNING: translation string unused: net traffic newversion
WARNING: translation string unused: net-traffic configuration
+WARNING: translation string unused: netbios name
WARNING: translation string unused: network added
WARNING: translation string unused: network configuration
WARNING: translation string unused: network removed
@@ -478,10 +516,12 @@ WARNING: translation string unused: no eciadsl synch.bin file
WARNING: translation string unused: no fritzdsl driver
WARNING: translation string unused: no hardware random number generator
WARNING: translation string unused: no information available
+WARNING: translation string unused: no log selected
WARNING: translation string unused: no modem selected
WARNING: translation string unused: no set selected
WARNING: translation string unused: nonetworkname
WARNING: translation string unused: noservicename
+WARNING: translation string unused: not set
WARNING: translation string unused: notes
WARNING: translation string unused: o-no
WARNING: translation string unused: o-yes
@@ -495,6 +535,7 @@ WARNING: translation string unused: optionsfw portlist hint
WARNING: translation string unused: optionsfw warning
WARNING: translation string unused: or
WARNING: translation string unused: original
+WARNING: translation string unused: os level
WARNING: translation string unused: other
WARNING: translation string unused: our donors
WARNING: translation string unused: out
@@ -556,6 +597,10 @@ WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
+WARNING: translation string unused: path to directory
+WARNING: translation string unused: pc
+WARNING: translation string unused: pc add
+WARNING: translation string unused: pdc options
WARNING: translation string unused: phase1 group
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
@@ -564,7 +609,13 @@ WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
+WARNING: translation string unused: prefered master
WARNING: translation string unused: present
+WARNING: translation string unused: printcap name
+WARNING: translation string unused: printer
+WARNING: translation string unused: printername
+WARNING: translation string unused: printing
+WARNING: translation string unused: printing options
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
@@ -574,6 +625,7 @@ WARNING: translation string unused: proxy port
WARNING: translation string unused: psk
WARNING: translation string unused: qos add subclass
WARNING: translation string unused: quick control
+WARNING: translation string unused: read list
WARNING: translation string unused: reboot ask
WARNING: translation string unused: reboot question
WARNING: translation string unused: reboot schedule
@@ -586,8 +638,12 @@ WARNING: translation string unused: reportlevel
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
+WARNING: translation string unused: reset shares
+WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
+WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -597,7 +653,10 @@ WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -605,25 +664,33 @@ WARNING: translation string unused: selecttraffic
WARNING: translation string unused: send email notification
WARNING: translation string unused: send test mail
WARNING: translation string unused: server reserved
+WARNING: translation string unused: server string
WARNING: translation string unused: service added
WARNING: translation string unused: service removed
WARNING: translation string unused: service updated
WARNING: translation string unused: servicename
WARNING: translation string unused: services settings
+WARNING: translation string unused: set
WARNING: translation string unused: shaping add options
WARNING: translation string unused: shaping list options
WARNING: translation string unused: show areas
+WARNING: translation string unused: show last x lines
WARNING: translation string unused: show lines
+WARNING: translation string unused: show share options
WARNING: translation string unused: shutdown ask
WARNING: translation string unused: shutdown sure
WARNING: translation string unused: shutdown2
WARNING: translation string unused: sitekey
WARNING: translation string unused: sitekeyfile
WARNING: translation string unused: smbreload
+WARNING: translation string unused: smbrestart
+WARNING: translation string unused: smbstart
+WARNING: translation string unused: smbstop
WARNING: translation string unused: smtphost
WARNING: translation string unused: smtpport
WARNING: translation string unused: snort hits
WARNING: translation string unused: snort working
+WARNING: translation string unused: socket options
WARNING: translation string unused: source ip bad
WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
@@ -712,6 +779,8 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: unix charset
+WARNING: translation string unused: unix password sync
WARNING: translation string unused: update transcript
WARNING: translation string unused: updatedatabase
WARNING: translation string unused: updates
@@ -750,6 +819,7 @@ WARNING: translation string unused: use
WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
+WARNING: translation string unused: visible in browselist
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn configuration main
WARNING: translation string unused: vpn delayed start
@@ -766,6 +836,8 @@ WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
+WARNING: translation string unused: wins server
+WARNING: translation string unused: wins support
WARNING: translation string unused: wlanap access point
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
@@ -838,11 +910,13 @@ WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
WARNING: untranslated string: dangerous = Dangerous
WARNING: untranslated string: default IP address = Default IP Address
+WARNING: untranslated string: desired = Desired
WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136):
WARNING: untranslated string: dhcp dns key name = Key Name
WARNING: untranslated string: dhcp dns update = DNS Update
WARNING: untranslated string: dhcp dns update algo = Algorithm
WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: disable = Disable
WARNING: untranslated string: disconnected = Disconnected
WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
WARNING: untranslated string: dns = unknown string
@@ -884,6 +958,7 @@ WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
WARNING: untranslated string: email tls implicit = implicit (TLS)
WARNING: untranslated string: email usemail = Activate Mail Service
WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
+WARNING: untranslated string: enable = Enable
WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
WARNING: untranslated string: error = Error
WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date!
@@ -1004,6 +1079,7 @@ WARNING: untranslated string: meltdown = Meltdown
WARNING: untranslated string: messages = Messages
WARNING: untranslated string: mitigated = Mitigated
WARNING: untranslated string: mtu = MTU
+WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
WARNING: untranslated string: no data = unknown string
WARNING: untranslated string: no entries = No entries at the moment.
WARNING: untranslated string: none = none
@@ -1014,6 +1090,7 @@ WARNING: untranslated string: one month = One Month
WARNING: untranslated string: one week = One Week
WARNING: untranslated string: one year = One Year
WARNING: untranslated string: open connections = Open Connections
+WARNING: untranslated string: optional = Optional
WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead
WARNING: untranslated string: ovpn add conf = Additional configuration
@@ -1036,6 +1113,7 @@ WARNING: untranslated string: processor vulnerability mitigations = Processor Vu
WARNING: untranslated string: ptr = PTR
WARNING: untranslated string: rdns = rDNS
WARNING: untranslated string: received = Received
+WARNING: untranslated string: required = Required
WARNING: untranslated string: required field = Required field
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
@@ -1043,8 +1121,11 @@ WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: routing table = unknown string
WARNING: untranslated string: samba join a domain = Join a domain
WARNING: untranslated string: samba join domain = Join domain
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: search = Search
WARNING: untranslated string: sent = Sent
+WARNING: untranslated string: smb daemon = SMB Daemon
WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled
WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported
@@ -1075,6 +1156,7 @@ WARNING: untranslated string: uncheck all = Uncheck all
WARNING: untranslated string: unlimited = Unlimited
WARNING: untranslated string: update ruleset = Update ruleset
WARNING: untranslated string: uplink bit rate = Uplink Bit Rate
+WARNING: untranslated string: user management = User Management
WARNING: untranslated string: vpn broken = Broken
WARNING: untranslated string: vpn connecting = CONNECTING
WARNING: untranslated string: vpn force mobike = Force using MOBIKE (only IKEv2)
@@ -1092,6 +1174,7 @@ WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wireless network = WiFi Network
WARNING: untranslated string: wlan client anonymous identity = Anonymous Identity
WARNING: untranslated string: wlan client auth auto = Auto
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index db78163c8..2afa7b0f3 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -15,15 +15,22 @@ WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Verbose
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
+WARNING: translation string unused: accounting
+WARNING: translation string unused: accounting user nonpdc
+WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
+WARNING: translation string unused: active
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
WARNING: translation string unused: add new ovpn
+WARNING: translation string unused: add printer
WARNING: translation string unused: add service
WARNING: translation string unused: add subclass
WARNING: translation string unused: add xtaccess
WARNING: translation string unused: add-route
WARNING: translation string unused: admin user password has been changed
+WARNING: translation string unused: admin users
WARNING: translation string unused: administrator user password
WARNING: translation string unused: advproxy LDAP auth
WARNING: translation string unused: advproxy NTLM BDC hostname
@@ -133,11 +140,14 @@ WARNING: translation string unused: capsinactive
WARNING: translation string unused: ccd err iroute
WARNING: translation string unused: ccd err netadr
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: choose media
WARNING: translation string unused: class in use
WARNING: translation string unused: clear cache
+WARNING: translation string unused: client
+WARNING: translation string unused: comment
WARNING: translation string unused: compression
WARNING: translation string unused: connect
WARNING: translation string unused: connect the modem
@@ -154,6 +164,7 @@ WARNING: translation string unused: could not open available updates file
WARNING: translation string unused: could not open installed updates file
WARNING: translation string unused: could not open update information file
WARNING: translation string unused: create
+WARNING: translation string unused: create mask
WARNING: translation string unused: create new backup
WARNING: translation string unused: current dynamic leases
WARNING: translation string unused: current media
@@ -170,6 +181,7 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
@@ -177,6 +189,9 @@ WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: deprecated fs warn
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
@@ -193,8 +208,11 @@ WARNING: translation string unused: dhcp server enabled on blue interface
WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
+WARNING: translation string unused: directory mask
+WARNING: translation string unused: directory writeable
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
+WARNING: translation string unused: display charset
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -219,9 +237,11 @@ WARNING: translation string unused: dns saved txt
WARNING: translation string unused: dns server
WARNING: translation string unused: dnsforward forward_server
WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: domain master
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
+WARNING: translation string unused: dos charset
WARNING: translation string unused: download new ruleset
WARNING: translation string unused: driver
WARNING: translation string unused: drop output
@@ -232,6 +252,7 @@ WARNING: translation string unused: eciadsl help
WARNING: translation string unused: eciadsl upload
WARNING: translation string unused: edit a rule
WARNING: translation string unused: edit network
+WARNING: translation string unused: edit printer
WARNING: translation string unused: edit service
WARNING: translation string unused: editor
WARNING: translation string unused: eg
@@ -257,6 +278,7 @@ WARNING: translation string unused: esp encryption
WARNING: translation string unused: esp grouptype
WARNING: translation string unused: esp integrity
WARNING: translation string unused: esp keylife
+WARNING: translation string unused: exampel
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
@@ -274,6 +296,7 @@ WARNING: translation string unused: firewall log viewer
WARNING: translation string unused: firmware
WARNING: translation string unused: firmware upload
WARNING: translation string unused: force update
+WARNING: translation string unused: force user
WARNING: translation string unused: forward firewall
WARNING: translation string unused: forwarding rule added
WARNING: translation string unused: forwarding rule removed
@@ -338,11 +361,14 @@ WARNING: translation string unused: generatepolicy
WARNING: translation string unused: generatereport
WARNING: translation string unused: genkey
WARNING: translation string unused: green interface
+WARNING: translation string unused: guest ok
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
+WARNING: translation string unused: host allow
WARNING: translation string unused: host configuration
+WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
@@ -362,6 +388,7 @@ WARNING: translation string unused: ike lifetime
WARNING: translation string unused: import
WARNING: translation string unused: importkey
WARNING: translation string unused: in
+WARNING: translation string unused: inactive
WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
@@ -369,6 +396,7 @@ WARNING: translation string unused: insert removable device
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
+WARNING: translation string unused: interfaces
WARNING: translation string unused: intrusion detection system log viewer
WARNING: translation string unused: intrusion detection system2
WARNING: translation string unused: invalid cache size
@@ -380,6 +408,7 @@ WARNING: translation string unused: invalid port list
WARNING: translation string unused: invalid time entered
WARNING: translation string unused: invalid uplink speed
WARNING: translation string unused: invalid upstream proxy username or password setting
+WARNING: translation string unused: invalid users
WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
@@ -399,12 +428,16 @@ WARNING: translation string unused: lang
WARNING: translation string unused: lateprompting
WARNING: translation string unused: length
WARNING: translation string unused: line
+WARNING: translation string unused: load printer
WARNING: translation string unused: loaded modules
WARNING: translation string unused: local hard disk
+WARNING: translation string unused: local master
WARNING: translation string unused: localkey
WARNING: translation string unused: localkeyfile
WARNING: translation string unused: log enabled
+WARNING: translation string unused: log level
WARNING: translation string unused: log var messages
+WARNING: translation string unused: log view
WARNING: translation string unused: log viewer
WARNING: translation string unused: logging
WARNING: translation string unused: loosedirectorychecking
@@ -422,6 +455,7 @@ WARNING: translation string unused: mac address error not 00
WARNING: translation string unused: mailmethod
WARNING: translation string unused: mailprogramm
WARNING: translation string unused: manage ovpn
+WARNING: translation string unused: manage printers
WARNING: translation string unused: manual
WARNING: translation string unused: manual control and status
WARNING: translation string unused: marked
@@ -432,6 +466,7 @@ WARNING: translation string unused: mbmon fan in
WARNING: translation string unused: mbmon graphs
WARNING: translation string unused: mbmon temp in
WARNING: translation string unused: mbmon value
+WARNING: translation string unused: meaning
WARNING: translation string unused: messages logging
WARNING: translation string unused: min size
WARNING: translation string unused: missing dat
@@ -449,8 +484,10 @@ WARNING: translation string unused: monthly traffic bad
WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
+WARNING: translation string unused: more
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
+WARNING: translation string unused: my new share
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net
WARNING: translation string unused: net address
@@ -458,6 +495,7 @@ WARNING: translation string unused: net config type
WARNING: translation string unused: net config type help
WARNING: translation string unused: net traffic newversion
WARNING: translation string unused: net-traffic configuration
+WARNING: translation string unused: netbios name
WARNING: translation string unused: network added
WARNING: translation string unused: network configuration
WARNING: translation string unused: network removed
@@ -473,10 +511,12 @@ WARNING: translation string unused: no eciadsl synch.bin file
WARNING: translation string unused: no fritzdsl driver
WARNING: translation string unused: no hardware random number generator
WARNING: translation string unused: no information available
+WARNING: translation string unused: no log selected
WARNING: translation string unused: no modem selected
WARNING: translation string unused: no set selected
WARNING: translation string unused: nonetworkname
WARNING: translation string unused: noservicename
+WARNING: translation string unused: not set
WARNING: translation string unused: notes
WARNING: translation string unused: o-no
WARNING: translation string unused: o-yes
@@ -490,6 +530,7 @@ WARNING: translation string unused: optionsfw portlist hint
WARNING: translation string unused: optionsfw warning
WARNING: translation string unused: or
WARNING: translation string unused: original
+WARNING: translation string unused: os level
WARNING: translation string unused: other
WARNING: translation string unused: our donors
WARNING: translation string unused: out
@@ -549,6 +590,10 @@ WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
+WARNING: translation string unused: path to directory
+WARNING: translation string unused: pc
+WARNING: translation string unused: pc add
+WARNING: translation string unused: pdc options
WARNING: translation string unused: phase1 group
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
@@ -557,7 +602,13 @@ WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
+WARNING: translation string unused: prefered master
WARNING: translation string unused: present
+WARNING: translation string unused: printcap name
+WARNING: translation string unused: printer
+WARNING: translation string unused: printername
+WARNING: translation string unused: printing
+WARNING: translation string unused: printing options
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
@@ -567,6 +618,7 @@ WARNING: translation string unused: proxy port
WARNING: translation string unused: psk
WARNING: translation string unused: qos add subclass
WARNING: translation string unused: quick control
+WARNING: translation string unused: read list
WARNING: translation string unused: reboot ask
WARNING: translation string unused: reboot question
WARNING: translation string unused: reboot schedule
@@ -579,8 +631,12 @@ WARNING: translation string unused: reportlevel
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
+WARNING: translation string unused: reset shares
+WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
+WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -590,7 +646,10 @@ WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -598,25 +657,33 @@ WARNING: translation string unused: selecttraffic
WARNING: translation string unused: send email notification
WARNING: translation string unused: send test mail
WARNING: translation string unused: server reserved
+WARNING: translation string unused: server string
WARNING: translation string unused: service added
WARNING: translation string unused: service removed
WARNING: translation string unused: service updated
WARNING: translation string unused: servicename
WARNING: translation string unused: services settings
+WARNING: translation string unused: set
WARNING: translation string unused: shaping add options
WARNING: translation string unused: shaping list options
WARNING: translation string unused: show areas
+WARNING: translation string unused: show last x lines
WARNING: translation string unused: show lines
+WARNING: translation string unused: show share options
WARNING: translation string unused: shutdown ask
WARNING: translation string unused: shutdown sure
WARNING: translation string unused: shutdown2
WARNING: translation string unused: sitekey
WARNING: translation string unused: sitekeyfile
WARNING: translation string unused: smbreload
+WARNING: translation string unused: smbrestart
+WARNING: translation string unused: smbstart
+WARNING: translation string unused: smbstop
WARNING: translation string unused: smtphost
WARNING: translation string unused: smtpport
WARNING: translation string unused: snort hits
WARNING: translation string unused: snort working
+WARNING: translation string unused: socket options
WARNING: translation string unused: source ip bad
WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
@@ -704,6 +771,8 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: unix charset
+WARNING: translation string unused: unix password sync
WARNING: translation string unused: update transcript
WARNING: translation string unused: updatedatabase
WARNING: translation string unused: updates
@@ -742,6 +811,7 @@ WARNING: translation string unused: use
WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
+WARNING: translation string unused: visible in browselist
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn configuration main
WARNING: translation string unused: vpn delayed start
@@ -758,6 +828,8 @@ WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
+WARNING: translation string unused: wins server
+WARNING: translation string unused: wins support
WARNING: translation string unused: wlanap access point
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
@@ -833,6 +905,7 @@ WARNING: untranslated string: crypto warning = Cryptographic warning
WARNING: untranslated string: dangerous = Dangerous
WARNING: untranslated string: default = Default
WARNING: untranslated string: default IP address = Default IP Address
+WARNING: untranslated string: desired = Desired
WARNING: untranslated string: dh = Diffie-Hellman parameters
WARNING: untranslated string: dh key move failed = Diffie-Hellman parameters move failed.
WARNING: untranslated string: dh key warn = Creating DH-parameters with a length of 2048 bits takes up to several minutes. Lengths of 3072 or 4096 bits might needs several hours. Please be patient.
@@ -843,6 +916,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name
WARNING: untranslated string: dhcp dns update = DNS Update
WARNING: untranslated string: dhcp dns update algo = Algorithm
WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: disable = Disable
WARNING: untranslated string: disconnected = Disconnected
WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
WARNING: untranslated string: dns = unknown string
@@ -889,6 +963,7 @@ WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
WARNING: untranslated string: email tls implicit = implicit (TLS)
WARNING: untranslated string: email usemail = Activate Mail Service
WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
+WARNING: untranslated string: enable = Enable
WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
WARNING: untranslated string: error = Error
WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date!
@@ -1028,6 +1103,7 @@ WARNING: untranslated string: modem status = Modem Status
WARNING: untranslated string: monitor interface = Monitor Interface
WARNING: untranslated string: mtu = MTU
WARNING: untranslated string: nameserver = Nameserver
+WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
WARNING: untranslated string: no data = unknown string
WARNING: untranslated string: no entries = No entries at the moment.
WARNING: untranslated string: none = none
@@ -1039,6 +1115,7 @@ WARNING: untranslated string: one month = One Month
WARNING: untranslated string: one week = One Week
WARNING: untranslated string: one year = One Year
WARNING: untranslated string: open connections = Open Connections
+WARNING: untranslated string: optional = Optional
WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead
WARNING: untranslated string: ovpn add conf = Additional configuration
@@ -1069,6 +1146,7 @@ WARNING: untranslated string: ptr = PTR
WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon
WARNING: untranslated string: rdns = rDNS
WARNING: untranslated string: received = Received
+WARNING: untranslated string: required = Required
WARNING: untranslated string: required field = Required field
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
@@ -1076,10 +1154,13 @@ WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: routing table = unknown string
WARNING: untranslated string: samba join a domain = Join a domain
WARNING: untranslated string: samba join domain = Join domain
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: search = Search
WARNING: untranslated string: sent = Sent
WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
WARNING: untranslated string: show tls-auth key = Show tls-auth key
+WARNING: untranslated string: smb daemon = SMB Daemon
WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled
WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported
@@ -1114,6 +1195,7 @@ WARNING: untranslated string: unlimited = Unlimited
WARNING: untranslated string: update ruleset = Update ruleset
WARNING: untranslated string: uplink bit rate = Uplink Bit Rate
WARNING: untranslated string: upload dh key = Upload Diffie-Hellman parameters
+WARNING: untranslated string: user management = User Management
WARNING: untranslated string: vendor = Vendor
WARNING: untranslated string: vpn broken = Broken
WARNING: untranslated string: vpn connecting = CONNECTING
@@ -1132,6 +1214,7 @@ WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wireless network = WiFi Network
WARNING: untranslated string: wlan client anonymous identity = Anonymous Identity
WARNING: untranslated string: wlan client auth auto = Auto
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index e8b39de69..689eeca7c 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -14,15 +14,22 @@ WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Verbose
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
+WARNING: translation string unused: accounting
+WARNING: translation string unused: accounting user nonpdc
+WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
+WARNING: translation string unused: active
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
WARNING: translation string unused: add new ovpn
+WARNING: translation string unused: add printer
WARNING: translation string unused: add service
WARNING: translation string unused: add subclass
WARNING: translation string unused: add xtaccess
WARNING: translation string unused: add-route
WARNING: translation string unused: admin user password has been changed
+WARNING: translation string unused: admin users
WARNING: translation string unused: administrator user password
WARNING: translation string unused: advproxy LDAP auth
WARNING: translation string unused: advproxy NTLM BDC hostname
@@ -126,11 +133,14 @@ WARNING: translation string unused: cannot enable both nat traversal and compres
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: choose media
WARNING: translation string unused: class in use
WARNING: translation string unused: clear cache
+WARNING: translation string unused: client
+WARNING: translation string unused: comment
WARNING: translation string unused: compression
WARNING: translation string unused: connect
WARNING: translation string unused: connect the modem
@@ -147,6 +157,7 @@ WARNING: translation string unused: could not open available updates file
WARNING: translation string unused: could not open installed updates file
WARNING: translation string unused: could not open update information file
WARNING: translation string unused: create
+WARNING: translation string unused: create mask
WARNING: translation string unused: create new backup
WARNING: translation string unused: current dynamic leases
WARNING: translation string unused: current media
@@ -163,12 +174,16 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
WARNING: translation string unused: destination ip or net
@@ -184,8 +199,11 @@ WARNING: translation string unused: dhcp server enabled on blue interface
WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
+WARNING: translation string unused: directory mask
+WARNING: translation string unused: directory writeable
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
+WARNING: translation string unused: display charset
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -209,9 +227,11 @@ WARNING: translation string unused: dns saved
WARNING: translation string unused: dns saved txt
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: domain master
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
+WARNING: translation string unused: dos charset
WARNING: translation string unused: download new ruleset
WARNING: translation string unused: driver
WARNING: translation string unused: drop output
@@ -222,6 +242,7 @@ WARNING: translation string unused: eciadsl help
WARNING: translation string unused: eciadsl upload
WARNING: translation string unused: edit a rule
WARNING: translation string unused: edit network
+WARNING: translation string unused: edit printer
WARNING: translation string unused: edit service
WARNING: translation string unused: editor
WARNING: translation string unused: eg
@@ -247,6 +268,7 @@ WARNING: translation string unused: esp encryption
WARNING: translation string unused: esp grouptype
WARNING: translation string unused: esp integrity
WARNING: translation string unused: esp keylife
+WARNING: translation string unused: exampel
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
@@ -264,6 +286,7 @@ WARNING: translation string unused: firewall log viewer
WARNING: translation string unused: firmware
WARNING: translation string unused: firmware upload
WARNING: translation string unused: force update
+WARNING: translation string unused: force user
WARNING: translation string unused: forwarding rule added
WARNING: translation string unused: forwarding rule removed
WARNING: translation string unused: forwarding rule updated
@@ -285,11 +308,14 @@ WARNING: translation string unused: generatepolicy
WARNING: translation string unused: generatereport
WARNING: translation string unused: genkey
WARNING: translation string unused: green interface
+WARNING: translation string unused: guest ok
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
+WARNING: translation string unused: host allow
WARNING: translation string unused: host configuration
+WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
@@ -309,6 +335,7 @@ WARNING: translation string unused: ike lifetime
WARNING: translation string unused: import
WARNING: translation string unused: importkey
WARNING: translation string unused: in
+WARNING: translation string unused: inactive
WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
@@ -316,6 +343,7 @@ WARNING: translation string unused: insert removable device
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
+WARNING: translation string unused: interfaces
WARNING: translation string unused: intrusion detection system log viewer
WARNING: translation string unused: intrusion detection system2
WARNING: translation string unused: invalid cache size
@@ -327,6 +355,7 @@ WARNING: translation string unused: invalid port list
WARNING: translation string unused: invalid time entered
WARNING: translation string unused: invalid uplink speed
WARNING: translation string unused: invalid upstream proxy username or password setting
+WARNING: translation string unused: invalid users
WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
@@ -345,15 +374,19 @@ WARNING: translation string unused: lang
WARNING: translation string unused: lateprompting
WARNING: translation string unused: length
WARNING: translation string unused: line
+WARNING: translation string unused: load printer
WARNING: translation string unused: loaded modules
WARNING: translation string unused: local hard disk
+WARNING: translation string unused: local master
WARNING: translation string unused: localkey
WARNING: translation string unused: localkeyfile
WARNING: translation string unused: locationblock country code
WARNING: translation string unused: locationblock country name
WARNING: translation string unused: locationblock flag
WARNING: translation string unused: log enabled
+WARNING: translation string unused: log level
WARNING: translation string unused: log var messages
+WARNING: translation string unused: log view
WARNING: translation string unused: log viewer
WARNING: translation string unused: logging
WARNING: translation string unused: loosedirectorychecking
@@ -371,6 +404,7 @@ WARNING: translation string unused: mac address error not 00
WARNING: translation string unused: mailmethod
WARNING: translation string unused: mailprogramm
WARNING: translation string unused: manage ovpn
+WARNING: translation string unused: manage printers
WARNING: translation string unused: manual
WARNING: translation string unused: manual control and status
WARNING: translation string unused: marked
@@ -381,6 +415,7 @@ WARNING: translation string unused: mbmon fan in
WARNING: translation string unused: mbmon graphs
WARNING: translation string unused: mbmon temp in
WARNING: translation string unused: mbmon value
+WARNING: translation string unused: meaning
WARNING: translation string unused: messages logging
WARNING: translation string unused: min size
WARNING: translation string unused: missing dat
@@ -398,8 +433,10 @@ WARNING: translation string unused: monthly traffic bad
WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
+WARNING: translation string unused: more
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
+WARNING: translation string unused: my new share
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net
WARNING: translation string unused: net address
@@ -407,6 +444,7 @@ WARNING: translation string unused: net config type
WARNING: translation string unused: net config type help
WARNING: translation string unused: net traffic newversion
WARNING: translation string unused: net-traffic configuration
+WARNING: translation string unused: netbios name
WARNING: translation string unused: network added
WARNING: translation string unused: network configuration
WARNING: translation string unused: network removed
@@ -421,10 +459,12 @@ WARNING: translation string unused: no cfg upload
WARNING: translation string unused: no eciadsl synch.bin file
WARNING: translation string unused: no fritzdsl driver
WARNING: translation string unused: no information available
+WARNING: translation string unused: no log selected
WARNING: translation string unused: no modem selected
WARNING: translation string unused: no set selected
WARNING: translation string unused: nonetworkname
WARNING: translation string unused: noservicename
+WARNING: translation string unused: not set
WARNING: translation string unused: notes
WARNING: translation string unused: o-no
WARNING: translation string unused: o-yes
@@ -436,6 +476,7 @@ WARNING: translation string unused: optionsfw portlist hint
WARNING: translation string unused: optionsfw warning
WARNING: translation string unused: or
WARNING: translation string unused: original
+WARNING: translation string unused: os level
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall mode0
@@ -475,6 +516,10 @@ WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
+WARNING: translation string unused: path to directory
+WARNING: translation string unused: pc
+WARNING: translation string unused: pc add
+WARNING: translation string unused: pdc options
WARNING: translation string unused: phase1 group
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
@@ -483,7 +528,13 @@ WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
+WARNING: translation string unused: prefered master
WARNING: translation string unused: present
+WARNING: translation string unused: printcap name
+WARNING: translation string unused: printer
+WARNING: translation string unused: printername
+WARNING: translation string unused: printing
+WARNING: translation string unused: printing options
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
@@ -493,6 +544,7 @@ WARNING: translation string unused: proxy port
WARNING: translation string unused: psk
WARNING: translation string unused: qos add subclass
WARNING: translation string unused: quick control
+WARNING: translation string unused: read list
WARNING: translation string unused: reboot ask
WARNING: translation string unused: reboot question
WARNING: translation string unused: reboot schedule
@@ -505,8 +557,12 @@ WARNING: translation string unused: reportlevel
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
+WARNING: translation string unused: reset shares
+WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
+WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -516,7 +572,10 @@ WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -524,25 +583,33 @@ WARNING: translation string unused: selecttraffic
WARNING: translation string unused: send email notification
WARNING: translation string unused: send test mail
WARNING: translation string unused: server reserved
+WARNING: translation string unused: server string
WARNING: translation string unused: service added
WARNING: translation string unused: service removed
WARNING: translation string unused: service updated
WARNING: translation string unused: servicename
WARNING: translation string unused: services settings
+WARNING: translation string unused: set
WARNING: translation string unused: shaping add options
WARNING: translation string unused: shaping list options
WARNING: translation string unused: show areas
+WARNING: translation string unused: show last x lines
WARNING: translation string unused: show lines
+WARNING: translation string unused: show share options
WARNING: translation string unused: shutdown ask
WARNING: translation string unused: shutdown sure
WARNING: translation string unused: shutdown2
WARNING: translation string unused: sitekey
WARNING: translation string unused: sitekeyfile
WARNING: translation string unused: smbreload
+WARNING: translation string unused: smbrestart
+WARNING: translation string unused: smbstart
+WARNING: translation string unused: smbstop
WARNING: translation string unused: smtphost
WARNING: translation string unused: smtpport
WARNING: translation string unused: snort hits
WARNING: translation string unused: snort working
+WARNING: translation string unused: socket options
WARNING: translation string unused: source ip bad
WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
@@ -622,6 +689,8 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: unix charset
+WARNING: translation string unused: unix password sync
WARNING: translation string unused: update transcript
WARNING: translation string unused: updatedatabase
WARNING: translation string unused: updates
@@ -656,6 +725,7 @@ WARNING: translation string unused: use
WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
+WARNING: translation string unused: visible in browselist
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn configuration main
WARNING: translation string unused: vpn delayed start
@@ -672,6 +742,8 @@ WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
+WARNING: translation string unused: wins server
+WARNING: translation string unused: wins support
WARNING: translation string unused: wlanap access point
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
@@ -805,6 +877,7 @@ WARNING: untranslated string: dangerous = Dangerous
WARNING: untranslated string: dead peer detection = Dead Peer Detection
WARNING: untranslated string: default = Default
WARNING: untranslated string: default IP address = Default IP Address
+WARNING: untranslated string: desired = Desired
WARNING: untranslated string: details = Details
WARNING: untranslated string: dh = Diffie-Hellman parameters
WARNING: untranslated string: dh key move failed = Diffie-Hellman parameters move failed.
@@ -816,6 +889,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name
WARNING: untranslated string: dhcp dns update = DNS Update
WARNING: untranslated string: dhcp dns update algo = Algorithm
WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: disable = Disable
WARNING: untranslated string: disconnected = Disconnected
WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
WARNING: untranslated string: dnat address = Firewall Interface
@@ -877,6 +951,7 @@ WARNING: untranslated string: email tls implicit = implicit (TLS)
WARNING: untranslated string: email usemail = Activate Mail Service
WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules
+WARNING: untranslated string: enable = Enable
WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
WARNING: untranslated string: encryption = Encryption:
WARNING: untranslated string: entropy = Entropy
@@ -1189,6 +1264,7 @@ WARNING: untranslated string: monitor interface = Monitor Interface
WARNING: untranslated string: most preferred = most preferred
WARNING: untranslated string: mtu = MTU
WARNING: untranslated string: nameserver = Nameserver
+WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
WARNING: untranslated string: no data = unknown string
WARNING: untranslated string: no entries = No entries at the moment.
WARNING: untranslated string: none = none
@@ -1210,6 +1286,7 @@ WARNING: untranslated string: openvpn prefix local subnet = Using the prefix not
WARNING: untranslated string: openvpn prefix openvpn subnet = Using the prefix notation is not supported for the OpenVPN subnet. Please enter a subnet mask like 255.255.255.0.
WARNING: untranslated string: openvpn prefix remote subnet = Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0.
WARNING: untranslated string: openvpn subnet is used = The given subnet is used by another OpenVPN server.
+WARNING: untranslated string: optional = Optional
WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
WARNING: untranslated string: outgoing firewall access = Outgoing Firewall Access
WARNING: untranslated string: outgoing firewall p2p allow = Using the P2P protocol is allowed
@@ -1260,6 +1337,7 @@ WARNING: untranslated string: random number generator daemon = Random Number Gen
WARNING: untranslated string: rdns = rDNS
WARNING: untranslated string: received = Received
WARNING: untranslated string: red1 = RED
+WARNING: untranslated string: required = Required
WARNING: untranslated string: required field = Required field
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
@@ -1267,11 +1345,14 @@ WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: routing table = unknown string
WARNING: untranslated string: samba join a domain = Join a domain
WARNING: untranslated string: samba join domain = Join domain
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: search = Search
WARNING: untranslated string: sent = Sent
WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
WARNING: untranslated string: show tls-auth key = Show tls-auth key
+WARNING: untranslated string: smb daemon = SMB Daemon
WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled
WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported
@@ -1363,6 +1444,7 @@ WARNING: untranslated string: uplink bit rate = Uplink Bit Rate
WARNING: untranslated string: upload dh key = Upload Diffie-Hellman parameters
WARNING: untranslated string: uptime load average = Load average
WARNING: untranslated string: urlfilter redirect template = Redirect page template
+WARNING: untranslated string: user management = User Management
WARNING: untranslated string: vendor = Vendor
WARNING: untranslated string: visit us at = Visit us at
WARNING: untranslated string: vpn broken = Broken
@@ -1383,6 +1465,7 @@ WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wireless network = WiFi Network
WARNING: untranslated string: wlan client = Wireless client
WARNING: untranslated string: wlan client advanced settings = Advanced settings
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index ef929331a..ac9715beb 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -15,15 +15,22 @@ WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Verbose
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
+WARNING: translation string unused: accounting
+WARNING: translation string unused: accounting user nonpdc
+WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
+WARNING: translation string unused: active
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
WARNING: translation string unused: add new ovpn
+WARNING: translation string unused: add printer
WARNING: translation string unused: add service
WARNING: translation string unused: add subclass
WARNING: translation string unused: add xtaccess
WARNING: translation string unused: add-route
WARNING: translation string unused: admin user password has been changed
+WARNING: translation string unused: admin users
WARNING: translation string unused: administrator user password
WARNING: translation string unused: advproxy LDAP auth
WARNING: translation string unused: advproxy NTLM BDC hostname
@@ -127,11 +134,14 @@ WARNING: translation string unused: cannot enable both nat traversal and compres
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: choose media
WARNING: translation string unused: class in use
WARNING: translation string unused: clear cache
+WARNING: translation string unused: client
+WARNING: translation string unused: comment
WARNING: translation string unused: compression
WARNING: translation string unused: connect
WARNING: translation string unused: connect the modem
@@ -148,6 +158,7 @@ WARNING: translation string unused: could not open available updates file
WARNING: translation string unused: could not open installed updates file
WARNING: translation string unused: could not open update information file
WARNING: translation string unused: create
+WARNING: translation string unused: create mask
WARNING: translation string unused: create new backup
WARNING: translation string unused: current dynamic leases
WARNING: translation string unused: current media
@@ -163,12 +174,16 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
WARNING: translation string unused: destination ip or net
@@ -184,8 +199,11 @@ WARNING: translation string unused: dhcp server enabled on blue interface
WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
+WARNING: translation string unused: directory mask
+WARNING: translation string unused: directory writeable
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
+WARNING: translation string unused: display charset
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -209,9 +227,11 @@ WARNING: translation string unused: dns saved
WARNING: translation string unused: dns saved txt
WARNING: translation string unused: dns server
WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: domain master
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
+WARNING: translation string unused: dos charset
WARNING: translation string unused: download new ruleset
WARNING: translation string unused: driver
WARNING: translation string unused: drop output
@@ -222,6 +242,7 @@ WARNING: translation string unused: eciadsl help
WARNING: translation string unused: eciadsl upload
WARNING: translation string unused: edit a rule
WARNING: translation string unused: edit network
+WARNING: translation string unused: edit printer
WARNING: translation string unused: edit service
WARNING: translation string unused: editor
WARNING: translation string unused: eg
@@ -247,6 +268,7 @@ WARNING: translation string unused: esp encryption
WARNING: translation string unused: esp grouptype
WARNING: translation string unused: esp integrity
WARNING: translation string unused: esp keylife
+WARNING: translation string unused: exampel
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
@@ -262,6 +284,7 @@ WARNING: translation string unused: firewall log viewer
WARNING: translation string unused: firmware
WARNING: translation string unused: firmware upload
WARNING: translation string unused: force update
+WARNING: translation string unused: force user
WARNING: translation string unused: forwarding rule added
WARNING: translation string unused: forwarding rule removed
WARNING: translation string unused: forwarding rule updated
@@ -282,11 +305,14 @@ WARNING: translation string unused: generatepolicy
WARNING: translation string unused: generatereport
WARNING: translation string unused: genkey
WARNING: translation string unused: green interface
+WARNING: translation string unused: guest ok
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
+WARNING: translation string unused: host allow
WARNING: translation string unused: host configuration
+WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hours2
WARNING: translation string unused: ibod for dual isdn only
@@ -305,6 +331,7 @@ WARNING: translation string unused: ike lifetime
WARNING: translation string unused: import
WARNING: translation string unused: importkey
WARNING: translation string unused: in
+WARNING: translation string unused: inactive
WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
@@ -312,6 +339,7 @@ WARNING: translation string unused: insert removable device
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
+WARNING: translation string unused: interfaces
WARNING: translation string unused: intrusion detection system log viewer
WARNING: translation string unused: intrusion detection system2
WARNING: translation string unused: invalid cache size
@@ -323,6 +351,7 @@ WARNING: translation string unused: invalid port list
WARNING: translation string unused: invalid time entered
WARNING: translation string unused: invalid uplink speed
WARNING: translation string unused: invalid upstream proxy username or password setting
+WARNING: translation string unused: invalid users
WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
@@ -341,12 +370,16 @@ WARNING: translation string unused: lang
WARNING: translation string unused: lateprompting
WARNING: translation string unused: length
WARNING: translation string unused: line
+WARNING: translation string unused: load printer
WARNING: translation string unused: loaded modules
WARNING: translation string unused: local hard disk
+WARNING: translation string unused: local master
WARNING: translation string unused: localkey
WARNING: translation string unused: localkeyfile
WARNING: translation string unused: log enabled
+WARNING: translation string unused: log level
WARNING: translation string unused: log var messages
+WARNING: translation string unused: log view
WARNING: translation string unused: log viewer
WARNING: translation string unused: logging
WARNING: translation string unused: loosedirectorychecking
@@ -364,6 +397,7 @@ WARNING: translation string unused: mac address error not 00
WARNING: translation string unused: mailmethod
WARNING: translation string unused: mailprogramm
WARNING: translation string unused: manage ovpn
+WARNING: translation string unused: manage printers
WARNING: translation string unused: manual
WARNING: translation string unused: manual control and status
WARNING: translation string unused: marked
@@ -374,6 +408,7 @@ WARNING: translation string unused: mbmon fan in
WARNING: translation string unused: mbmon graphs
WARNING: translation string unused: mbmon temp in
WARNING: translation string unused: mbmon value
+WARNING: translation string unused: meaning
WARNING: translation string unused: messages logging
WARNING: translation string unused: min size
WARNING: translation string unused: missing dat
@@ -390,8 +425,10 @@ WARNING: translation string unused: monthly traffic bad
WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
+WARNING: translation string unused: more
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
+WARNING: translation string unused: my new share
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net
WARNING: translation string unused: net address
@@ -399,6 +436,7 @@ WARNING: translation string unused: net config type
WARNING: translation string unused: net config type help
WARNING: translation string unused: net traffic newversion
WARNING: translation string unused: net-traffic configuration
+WARNING: translation string unused: netbios name
WARNING: translation string unused: network added
WARNING: translation string unused: network configuration
WARNING: translation string unused: network removed
@@ -413,10 +451,12 @@ WARNING: translation string unused: no cfg upload
WARNING: translation string unused: no eciadsl synch.bin file
WARNING: translation string unused: no fritzdsl driver
WARNING: translation string unused: no information available
+WARNING: translation string unused: no log selected
WARNING: translation string unused: no modem selected
WARNING: translation string unused: no set selected
WARNING: translation string unused: nonetworkname
WARNING: translation string unused: noservicename
+WARNING: translation string unused: not set
WARNING: translation string unused: notes
WARNING: translation string unused: o-no
WARNING: translation string unused: o-yes
@@ -428,6 +468,7 @@ WARNING: translation string unused: optionsfw portlist hint
WARNING: translation string unused: optionsfw warning
WARNING: translation string unused: or
WARNING: translation string unused: original
+WARNING: translation string unused: os level
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall
WARNING: translation string unused: outgoing firewall add ip group
@@ -478,6 +519,10 @@ WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
+WARNING: translation string unused: path to directory
+WARNING: translation string unused: pc
+WARNING: translation string unused: pc add
+WARNING: translation string unused: pdc options
WARNING: translation string unused: phase1 group
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
@@ -486,7 +531,13 @@ WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
+WARNING: translation string unused: prefered master
WARNING: translation string unused: present
+WARNING: translation string unused: printcap name
+WARNING: translation string unused: printer
+WARNING: translation string unused: printername
+WARNING: translation string unused: printing
+WARNING: translation string unused: printing options
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
@@ -496,6 +547,7 @@ WARNING: translation string unused: proxy port
WARNING: translation string unused: psk
WARNING: translation string unused: qos add subclass
WARNING: translation string unused: quick control
+WARNING: translation string unused: read list
WARNING: translation string unused: reboot ask
WARNING: translation string unused: reboot question
WARNING: translation string unused: reboot schedule
@@ -508,8 +560,12 @@ WARNING: translation string unused: reportlevel
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
+WARNING: translation string unused: reset shares
+WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
+WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -519,7 +575,10 @@ WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -527,25 +586,33 @@ WARNING: translation string unused: selecttraffic
WARNING: translation string unused: send email notification
WARNING: translation string unused: send test mail
WARNING: translation string unused: server reserved
+WARNING: translation string unused: server string
WARNING: translation string unused: service added
WARNING: translation string unused: service removed
WARNING: translation string unused: service updated
WARNING: translation string unused: servicename
WARNING: translation string unused: services settings
+WARNING: translation string unused: set
WARNING: translation string unused: shaping add options
WARNING: translation string unused: shaping list options
WARNING: translation string unused: show areas
+WARNING: translation string unused: show last x lines
WARNING: translation string unused: show lines
+WARNING: translation string unused: show share options
WARNING: translation string unused: shutdown ask
WARNING: translation string unused: shutdown sure
WARNING: translation string unused: shutdown2
WARNING: translation string unused: sitekey
WARNING: translation string unused: sitekeyfile
WARNING: translation string unused: smbreload
+WARNING: translation string unused: smbrestart
+WARNING: translation string unused: smbstart
+WARNING: translation string unused: smbstop
WARNING: translation string unused: smtphost
WARNING: translation string unused: smtpport
WARNING: translation string unused: snort hits
WARNING: translation string unused: snort working
+WARNING: translation string unused: socket options
WARNING: translation string unused: source ip bad
WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
@@ -625,6 +692,8 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: unix charset
+WARNING: translation string unused: unix password sync
WARNING: translation string unused: update transcript
WARNING: translation string unused: updatedatabase
WARNING: translation string unused: updates
@@ -659,6 +728,7 @@ WARNING: translation string unused: use
WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
+WARNING: translation string unused: visible in browselist
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn configuration main
WARNING: translation string unused: vpn delayed start
@@ -674,6 +744,8 @@ WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
+WARNING: translation string unused: wins server
+WARNING: translation string unused: wins support
WARNING: translation string unused: wlanap access point
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
@@ -808,6 +880,7 @@ WARNING: untranslated string: dangerous = Dangerous
WARNING: untranslated string: dead peer detection = Dead Peer Detection
WARNING: untranslated string: default = Default
WARNING: untranslated string: default IP address = Default IP Address
+WARNING: untranslated string: desired = Desired
WARNING: untranslated string: details = Details
WARNING: untranslated string: dh = Diffie-Hellman parameters
WARNING: untranslated string: dh key move failed = Diffie-Hellman parameters move failed.
@@ -819,6 +892,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name
WARNING: untranslated string: dhcp dns update = DNS Update
WARNING: untranslated string: dhcp dns update algo = Algorithm
WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: disable = Disable
WARNING: untranslated string: disconnected = Disconnected
WARNING: untranslated string: disk access = Disk Access
WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
@@ -881,6 +955,7 @@ WARNING: untranslated string: email tls implicit = implicit (TLS)
WARNING: untranslated string: email usemail = Activate Mail Service
WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules
+WARNING: untranslated string: enable = Enable
WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
WARNING: untranslated string: encryption = Encryption:
WARNING: untranslated string: entropy = Entropy
@@ -1191,6 +1266,7 @@ WARNING: untranslated string: monitor interface = Monitor Interface
WARNING: untranslated string: most preferred = most preferred
WARNING: untranslated string: mtu = MTU
WARNING: untranslated string: nameserver = Nameserver
+WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
WARNING: untranslated string: no data = unknown string
WARNING: untranslated string: no entries = No entries at the moment.
WARNING: untranslated string: none = none
@@ -1212,6 +1288,7 @@ WARNING: untranslated string: openvpn prefix local subnet = Using the prefix not
WARNING: untranslated string: openvpn prefix openvpn subnet = Using the prefix notation is not supported for the OpenVPN subnet. Please enter a subnet mask like 255.255.255.0.
WARNING: untranslated string: openvpn prefix remote subnet = Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0.
WARNING: untranslated string: openvpn subnet is used = The given subnet is used by another OpenVPN server.
+WARNING: untranslated string: optional = Optional
WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
WARNING: untranslated string: outgoing firewall access = Outgoing Firewall Access
WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead
@@ -1256,6 +1333,7 @@ WARNING: untranslated string: random number generator daemon = Random Number Gen
WARNING: untranslated string: rdns = rDNS
WARNING: untranslated string: received = Received
WARNING: untranslated string: red1 = RED
+WARNING: untranslated string: required = Required
WARNING: untranslated string: required field = Required field
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
@@ -1263,11 +1341,14 @@ WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: routing table = unknown string
WARNING: untranslated string: samba join a domain = Join a domain
WARNING: untranslated string: samba join domain = Join domain
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: search = Search
WARNING: untranslated string: sent = Sent
WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
WARNING: untranslated string: show tls-auth key = Show tls-auth key
+WARNING: untranslated string: smb daemon = SMB Daemon
WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled
WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported
@@ -1358,6 +1439,7 @@ WARNING: untranslated string: uplink bit rate = Uplink Bit Rate
WARNING: untranslated string: upload dh key = Upload Diffie-Hellman parameters
WARNING: untranslated string: uptime load average = Load average
WARNING: untranslated string: urlfilter redirect template = Redirect page template
+WARNING: untranslated string: user management = User Management
WARNING: untranslated string: vendor = Vendor
WARNING: untranslated string: visit us at = Visit us at
WARNING: untranslated string: vpn broken = Broken
@@ -1378,6 +1460,7 @@ WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wireless network = WiFi Network
WARNING: untranslated string: wlan client = Wireless client
WARNING: untranslated string: wlan client advanced settings = Advanced settings
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index ba5164cd6..7613e2ff7 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -36,15 +36,22 @@ WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Verbose
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
+WARNING: translation string unused: accounting
+WARNING: translation string unused: accounting user nonpdc
+WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
+WARNING: translation string unused: active
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
WARNING: translation string unused: add new ovpn
+WARNING: translation string unused: add printer
WARNING: translation string unused: add service
WARNING: translation string unused: add subclass
WARNING: translation string unused: add xtaccess
WARNING: translation string unused: add-route
WARNING: translation string unused: admin user password has been changed
+WARNING: translation string unused: admin users
WARNING: translation string unused: administrator user password
WARNING: translation string unused: adsl settings
WARNING: translation string unused: advproxy AUTH method ntlm
@@ -156,11 +163,14 @@ WARNING: translation string unused: capsinactive
WARNING: translation string unused: ccd err iroute
WARNING: translation string unused: ccd err netadr
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: choose media
WARNING: translation string unused: class in use
WARNING: translation string unused: clear cache
+WARNING: translation string unused: client
+WARNING: translation string unused: comment
WARNING: translation string unused: compression
WARNING: translation string unused: connect
WARNING: translation string unused: connect the modem
@@ -177,6 +187,7 @@ WARNING: translation string unused: could not open available updates file
WARNING: translation string unused: could not open installed updates file
WARNING: translation string unused: could not open update information file
WARNING: translation string unused: create
+WARNING: translation string unused: create mask
WARNING: translation string unused: create new backup
WARNING: translation string unused: current dynamic leases
WARNING: translation string unused: current media
@@ -193,6 +204,7 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
@@ -200,6 +212,9 @@ WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: deprecated fs warn
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
@@ -217,8 +232,11 @@ WARNING: translation string unused: dhcp server enabled on blue interface
WARNING: translation string unused: dial user password
WARNING: translation string unused: dial user password has been changed
WARNING: translation string unused: dialup settings
+WARNING: translation string unused: directory mask
+WARNING: translation string unused: directory writeable
WARNING: translation string unused: disconnect
WARNING: translation string unused: disconnects
+WARNING: translation string unused: display charset
WARNING: translation string unused: display traffic at home
WARNING: translation string unused: display webinterface effects
WARNING: translation string unused: dmz pinhole configuration
@@ -245,9 +263,11 @@ WARNING: translation string unused: dns servers
WARNING: translation string unused: dnsforward forward_server
WARNING: translation string unused: dnssec information
WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: domain master
WARNING: translation string unused: domain not set
WARNING: translation string unused: donation-link
WARNING: translation string unused: done
+WARNING: translation string unused: dos charset
WARNING: translation string unused: download dh parameter
WARNING: translation string unused: download new ruleset
WARNING: translation string unused: driver
@@ -258,6 +278,7 @@ WARNING: translation string unused: eciadsl help
WARNING: translation string unused: eciadsl upload
WARNING: translation string unused: edit a rule
WARNING: translation string unused: edit network
+WARNING: translation string unused: edit printer
WARNING: translation string unused: edit service
WARNING: translation string unused: editor
WARNING: translation string unused: eg
@@ -287,6 +308,7 @@ WARNING: translation string unused: esp encryption
WARNING: translation string unused: esp grouptype
WARNING: translation string unused: esp integrity
WARNING: translation string unused: esp keylife
+WARNING: translation string unused: exampel
WARNING: translation string unused: expected
WARNING: translation string unused: expertoptions
WARNING: translation string unused: exportkey
@@ -302,6 +324,7 @@ WARNING: translation string unused: filename
WARNING: translation string unused: firmware
WARNING: translation string unused: firmware upload
WARNING: translation string unused: force update
+WARNING: translation string unused: force user
WARNING: translation string unused: forward firewall
WARNING: translation string unused: forwarding rule added
WARNING: translation string unused: forwarding rule removed
@@ -367,11 +390,14 @@ WARNING: translation string unused: generatepolicy
WARNING: translation string unused: generatereport
WARNING: translation string unused: genkey
WARNING: translation string unused: green interface
+WARNING: translation string unused: guest ok
WARNING: translation string unused: gz with key
WARNING: translation string unused: harddisk temperature graphs
WARNING: translation string unused: hint
WARNING: translation string unused: host
+WARNING: translation string unused: host allow
WARNING: translation string unused: host configuration
+WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
@@ -391,6 +417,7 @@ WARNING: translation string unused: ike lifetime
WARNING: translation string unused: import
WARNING: translation string unused: importkey
WARNING: translation string unused: in
+WARNING: translation string unused: inactive
WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
@@ -398,6 +425,7 @@ WARNING: translation string unused: insert removable device
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
+WARNING: translation string unused: interfaces
WARNING: translation string unused: intrusion detection system log viewer
WARNING: translation string unused: intrusion detection system2
WARNING: translation string unused: invalid cache size
@@ -409,6 +437,7 @@ WARNING: translation string unused: invalid port list
WARNING: translation string unused: invalid time entered
WARNING: translation string unused: invalid uplink speed
WARNING: translation string unused: invalid upstream proxy username or password setting
+WARNING: translation string unused: invalid users
WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
@@ -428,15 +457,19 @@ WARNING: translation string unused: lang
WARNING: translation string unused: lateprompting
WARNING: translation string unused: length
WARNING: translation string unused: line
+WARNING: translation string unused: load printer
WARNING: translation string unused: loaded modules
WARNING: translation string unused: local hard disk
+WARNING: translation string unused: local master
WARNING: translation string unused: localkey
WARNING: translation string unused: localkeyfile
WARNING: translation string unused: locationblock country code
WARNING: translation string unused: locationblock country name
WARNING: translation string unused: locationblock flag
WARNING: translation string unused: log enabled
+WARNING: translation string unused: log level
WARNING: translation string unused: log var messages
+WARNING: translation string unused: log view
WARNING: translation string unused: log viewer
WARNING: translation string unused: logging
WARNING: translation string unused: loosedirectorychecking
@@ -454,6 +487,7 @@ WARNING: translation string unused: mac address error not 00
WARNING: translation string unused: mailmethod
WARNING: translation string unused: mailprogramm
WARNING: translation string unused: manage ovpn
+WARNING: translation string unused: manage printers
WARNING: translation string unused: manual
WARNING: translation string unused: manual control and status
WARNING: translation string unused: marked
@@ -464,6 +498,7 @@ WARNING: translation string unused: mbmon fan in
WARNING: translation string unused: mbmon graphs
WARNING: translation string unused: mbmon temp in
WARNING: translation string unused: mbmon value
+WARNING: translation string unused: meaning
WARNING: translation string unused: messages logging
WARNING: translation string unused: min size
WARNING: translation string unused: missing dat
@@ -481,8 +516,10 @@ WARNING: translation string unused: monthly traffic bad
WARNING: translation string unused: monthly volume
WARNING: translation string unused: monthly volume start day
WARNING: translation string unused: monthly volume start day short
+WARNING: translation string unused: more
WARNING: translation string unused: mount
WARNING: translation string unused: mtu QoS
+WARNING: translation string unused: my new share
WARNING: translation string unused: nat-traversal
WARNING: translation string unused: net
WARNING: translation string unused: net address
@@ -490,6 +527,7 @@ WARNING: translation string unused: net config type
WARNING: translation string unused: net config type help
WARNING: translation string unused: net traffic newversion
WARNING: translation string unused: net-traffic configuration
+WARNING: translation string unused: netbios name
WARNING: translation string unused: network added
WARNING: translation string unused: network configuration
WARNING: translation string unused: network removed
@@ -506,10 +544,12 @@ WARNING: translation string unused: no eciadsl synch.bin file
WARNING: translation string unused: no fritzdsl driver
WARNING: translation string unused: no hardware random number generator
WARNING: translation string unused: no information available
+WARNING: translation string unused: no log selected
WARNING: translation string unused: no modem selected
WARNING: translation string unused: no set selected
WARNING: translation string unused: nonetworkname
WARNING: translation string unused: noservicename
+WARNING: translation string unused: not set
WARNING: translation string unused: notes
WARNING: translation string unused: o-no
WARNING: translation string unused: o-yes
@@ -523,6 +563,7 @@ WARNING: translation string unused: optionsfw portlist hint
WARNING: translation string unused: optionsfw warning
WARNING: translation string unused: or
WARNING: translation string unused: original
+WARNING: translation string unused: os level
WARNING: translation string unused: other
WARNING: translation string unused: our donors
WARNING: translation string unused: out
@@ -584,6 +625,10 @@ WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
+WARNING: translation string unused: path to directory
+WARNING: translation string unused: pc
+WARNING: translation string unused: pc add
+WARNING: translation string unused: pdc options
WARNING: translation string unused: phase1 group
WARNING: translation string unused: phonebook entry
WARNING: translation string unused: ping disabled
@@ -592,7 +637,13 @@ WARNING: translation string unused: port forwarding configuration
WARNING: translation string unused: ports
WARNING: translation string unused: pots
WARNING: translation string unused: pppoe
+WARNING: translation string unused: prefered master
WARNING: translation string unused: present
+WARNING: translation string unused: printcap name
+WARNING: translation string unused: printer
+WARNING: translation string unused: printername
+WARNING: translation string unused: printing
+WARNING: translation string unused: printing options
WARNING: translation string unused: profiles
WARNING: translation string unused: proxy
WARNING: translation string unused: proxy access graphs
@@ -602,6 +653,7 @@ WARNING: translation string unused: proxy port
WARNING: translation string unused: psk
WARNING: translation string unused: qos add subclass
WARNING: translation string unused: quick control
+WARNING: translation string unused: read list
WARNING: translation string unused: reboot ask
WARNING: translation string unused: reboot question
WARNING: translation string unused: reboot schedule
@@ -614,8 +666,12 @@ WARNING: translation string unused: reportlevel
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
+WARNING: translation string unused: reset shares
+WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
+WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -625,7 +681,10 @@ WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -633,25 +692,33 @@ WARNING: translation string unused: selecttraffic
WARNING: translation string unused: send email notification
WARNING: translation string unused: send test mail
WARNING: translation string unused: server reserved
+WARNING: translation string unused: server string
WARNING: translation string unused: service added
WARNING: translation string unused: service removed
WARNING: translation string unused: service updated
WARNING: translation string unused: servicename
WARNING: translation string unused: services settings
+WARNING: translation string unused: set
WARNING: translation string unused: shaping add options
WARNING: translation string unused: shaping list options
WARNING: translation string unused: show areas
+WARNING: translation string unused: show last x lines
WARNING: translation string unused: show lines
+WARNING: translation string unused: show share options
WARNING: translation string unused: shutdown ask
WARNING: translation string unused: shutdown sure
WARNING: translation string unused: shutdown2
WARNING: translation string unused: sitekey
WARNING: translation string unused: sitekeyfile
WARNING: translation string unused: smbreload
+WARNING: translation string unused: smbrestart
+WARNING: translation string unused: smbstart
+WARNING: translation string unused: smbstop
WARNING: translation string unused: smtphost
WARNING: translation string unused: smtpport
WARNING: translation string unused: snort hits
WARNING: translation string unused: snort working
+WARNING: translation string unused: socket options
WARNING: translation string unused: source ip bad
WARNING: translation string unused: source ip in use
WARNING: translation string unused: source ip or net
@@ -740,6 +807,8 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: unix charset
+WARNING: translation string unused: unix password sync
WARNING: translation string unused: update transcript
WARNING: translation string unused: updatedatabase
WARNING: translation string unused: updates
@@ -778,6 +847,7 @@ WARNING: translation string unused: use
WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
+WARNING: translation string unused: visible in browselist
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn configuration main
WARNING: translation string unused: vpn delayed start
@@ -794,6 +864,8 @@ WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
WARNING: translation string unused: weekly firewallhits
WARNING: translation string unused: wildcards
+WARNING: translation string unused: wins server
+WARNING: translation string unused: wins support
WARNING: translation string unused: wlanap wlan services
WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
@@ -821,6 +893,8 @@ WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
WARNING: untranslated string: dangerous = Dangerous
WARNING: untranslated string: default IP address = Default IP Address
+WARNING: untranslated string: desired = Desired
+WARNING: untranslated string: disable = Disable
WARNING: untranslated string: disconnected = Disconnected
WARNING: untranslated string: dns = unknown string
WARNING: untranslated string: dns check servers = Check DNS Servers
@@ -843,6 +917,7 @@ WARNING: untranslated string: duration = Duration
WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
WARNING: untranslated string: email tls implicit = implicit (TLS)
WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
+WARNING: untranslated string: enable = Enable
WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
WARNING: untranslated string: error = Error
WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date!
@@ -922,11 +997,13 @@ WARNING: untranslated string: local ip address = Local IP Address
WARNING: untranslated string: meltdown = Meltdown
WARNING: untranslated string: mitigated = Mitigated
WARNING: untranslated string: mtu = MTU
+WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
WARNING: untranslated string: no data = unknown string
WARNING: untranslated string: no entries = No entries at the moment.
WARNING: untranslated string: not affected = Not Affected
WARNING: untranslated string: not validating = Not validating
WARNING: untranslated string: open connections = Open Connections
+WARNING: untranslated string: optional = Optional
WARNING: untranslated string: ovpn connection name = Connection Name
WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs to be in minimum 2048 bit! <br>Please generate or upload a new Diffie-Hellman parameter, this can be made below in the section "Diffie-Hellman parameters options".</br>
WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
@@ -942,11 +1019,15 @@ WARNING: untranslated string: please reboot to apply your changes = Please reboo
WARNING: untranslated string: processor vulnerability mitigations = Processor Vulnerability Mitigations
WARNING: untranslated string: ptr = PTR
WARNING: untranslated string: received = Received
+WARNING: untranslated string: required = Required
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: routing table = unknown string
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: sent = Sent
+WARNING: untranslated string: smb daemon = SMB Daemon
WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled
WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported
@@ -966,12 +1047,14 @@ WARNING: untranslated string: system is offline = The system is offline.
WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2
WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode
WARNING: untranslated string: update ruleset = Update ruleset
+WARNING: untranslated string: user management = User Management
WARNING: untranslated string: vpn start action add = Wait for connection initiation
WARNING: untranslated string: vpn statistics n2n = unknown string
WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
+WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wlanap auto = Automatic Channel Selection
WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID
WARNING: untranslated string: wlanap client isolation = Client Isolation
diff --git a/doc/language_missings b/doc/language_missings
index 01f95d7f9..a1fcdc334 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -27,29 +27,40 @@
< choose media
< could not connect to www ipfire org
< cryptographic settings
+< desired
< dhcp server disabled on blue interface
< dhcp server enabled on blue interface
< dh name is invalid
+< disable
< dns could not add server
< done
+< enable
< error the to date has to be later than the from date
< g.dtm
< g.lite
< insert removable device
+< netbios nameserver daemon
< no entries
< notes
< okay
+< optional
< quick control
+< required
+< samba server role member
+< samba server role standalone
< shaping add options
< show areas
< show lines
< show tls-auth key
+< smb daemon
< teovpn_fragment
< tor bridge enabled
< tor errmsg invalid node id
< updxlrtr used by
< upload fcdsl.o
+< user management
< vpn configuration main
+< winbind daemon
############################################################################
# Checking cgi-bin translations for language: es #
############################################################################
@@ -203,6 +214,7 @@
< default ip
< default IP address
< deprecated fs warn
+< desired
< details
< dh
< dhcp dns enable update
@@ -215,6 +227,7 @@
< dh key warn1
< dh name is invalid
< dh parameter
+< disable
< Disabled
< disconnected
< dl client arch insecure
@@ -284,6 +297,7 @@
< email usemail
< emerging pro rules
< emerging rules
+< enable
< enable smt
< encryption
< entropy
@@ -613,6 +627,7 @@
< mtu
< MTU settings
< nameserver
+< netbios nameserver daemon
< never
< no entries
< no hardware random number generator
@@ -639,6 +654,7 @@
< openvpn prefix openvpn subnet
< openvpn prefix remote subnet
< openvpn subnet is used
+< optional
< other
< our donors
< outgoing compression in bytes per second
@@ -711,16 +727,20 @@
< rdns
< received
< red1
+< required
< required field
< runmode
< samba join a domain
< samba join domain
+< samba server role member
+< samba server role standalone
< search
< sent
< server restart
< Set time on boot
< show dh
< show tls-auth key
+< smb daemon
< smt disabled
< smt enabled
< smt not supported
@@ -825,6 +845,7 @@
< uptime
< uptime load average
< urlfilter redirect template
+< user management
< vendor
< visit us at
< vpn broken
@@ -845,6 +866,7 @@
< vulnerability
< vulnerable
< Weekly
+< winbind daemon
< wireless network
< wlanap
< wlanap auto
@@ -922,9 +944,20 @@
< ansi t1.483
< bewan adsl pci st
< bewan adsl usb
+< desired
+< disable
+< enable
< g.dtm
< g.lite
+< netbios nameserver daemon
+< optional
+< required
+< samba server role member
+< samba server role standalone
+< smb daemon
< upload fcdsl.o
+< user management
+< winbind daemon
############################################################################
# Checking cgi-bin translations for language: it #
############################################################################
@@ -1010,11 +1043,13 @@
< Daily
< dangerous
< default IP address
+< desired
< dhcp dns enable update
< dhcp dns key name
< dhcp dns update
< dhcp dns update algo
< dhcp dns update secret
+< disable
< Disabled
< disconnected
< dl client arch insecure
@@ -1061,6 +1096,7 @@
< email tls implicit
< email usemail
< emerging pro rules
+< enable
< enable smt
< error
< error the to date has to be later than the from date
@@ -1155,6 +1191,7 @@
< mitigated
< mtu
< MTU settings
+< netbios nameserver daemon
< no entries
< none
< not affected
@@ -1166,6 +1203,7 @@
< one week
< one year
< open connections
+< optional
< outgoing compression in bytes per second
< outgoing overhead in bytes per second
< ovpn add conf
@@ -1188,12 +1226,16 @@
< ptr
< rdns
< received
+< required
< required field
< runmode
< samba join a domain
< samba join domain
+< samba server role member
+< samba server role standalone
< search
< sent
+< smb daemon
< smt disabled
< smt enabled
< smt not supported
@@ -1224,6 +1266,7 @@
< unlimited
< update ruleset
< uplink bit rate
+< user management
< vpn broken
< vpn connecting
< vpn force mobike
@@ -1241,6 +1284,7 @@
< vulnerability
< vulnerable
< Weekly
+< winbind daemon
< wireless network
< wlanap
< wlanap auto
@@ -1369,6 +1413,7 @@
< dangerous
< default
< default IP address
+< desired
< dh
< dhcp dns enable update
< dhcp dns key name
@@ -1380,6 +1425,7 @@
< dh key warn1
< dh name is invalid
< dh parameter
+< disable
< Disabled
< disconnected
< dl client arch insecure
@@ -1434,6 +1480,7 @@
< email tls implicit
< email usemail
< emerging pro rules
+< enable
< enable smt
< error
< error the to date has to be later than the from date
@@ -1547,6 +1594,7 @@
< mtu
< MTU settings
< nameserver
+< netbios nameserver daemon
< never
< no entries
< none
@@ -1560,6 +1608,7 @@
< one week
< one year
< open connections
+< optional
< outgoing compression in bytes per second
< outgoing overhead in bytes per second
< ovpn add conf
@@ -1592,14 +1641,18 @@
< random number generator daemon
< rdns
< received
+< required
< required field
< runmode
< samba join a domain
< samba join domain
+< samba server role member
+< samba server role standalone
< search
< sent
< show dh
< show tls-auth key
+< smb daemon
< smt disabled
< smt enabled
< smt not supported
@@ -1635,6 +1688,7 @@
< update ruleset
< uplink bit rate
< upload dh key
+< user management
< vendor
< vpn broken
< vpn connecting
@@ -1653,6 +1707,7 @@
< vulnerability
< vulnerable
< Weekly
+< winbind daemon
< wireless network
< wlanap
< wlanap auto
@@ -1845,6 +1900,7 @@
< default ip
< default IP address
< deprecated fs warn
+< desired
< details
< dh
< dhcp dns enable update
@@ -1857,6 +1913,7 @@
< dh key warn1
< dh name is invalid
< dh parameter
+< disable
< Disabled
< disconnected
< dl client arch insecure
@@ -1926,6 +1983,7 @@
< email usemail
< emerging pro rules
< emerging rules
+< enable
< enable smt
< encryption
< entropy
@@ -2257,6 +2315,7 @@
< mtu
< MTU settings
< nameserver
+< netbios nameserver daemon
< never
< no entries
< no hardware random number generator
@@ -2283,6 +2342,7 @@
< openvpn prefix openvpn subnet
< openvpn prefix remote subnet
< openvpn subnet is used
+< optional
< other
< our donors
< outgoing compression in bytes per second
@@ -2341,15 +2401,19 @@
< rdns
< received
< red1
+< required
< required field
< runmode
< samba join a domain
< samba join domain
+< samba server role member
+< samba server role standalone
< search
< sent
< server restart
< show dh
< show tls-auth key
+< smb daemon
< smt disabled
< smt enabled
< smt not supported
@@ -2453,6 +2517,7 @@
< uptime
< uptime load average
< urlfilter redirect template
+< user management
< vendor
< visit us at
< vpn broken
@@ -2473,6 +2538,7 @@
< vulnerability
< vulnerable
< Weekly
+< winbind daemon
< wireless network
< wlanap
< wlanap auto
@@ -2699,6 +2765,7 @@
< default ip
< default IP address
< deprecated fs warn
+< desired
< details
< dh
< dhcp dns enable update
@@ -2711,6 +2778,7 @@
< dh key warn1
< dh name is invalid
< dh parameter
+< disable
< Disabled
< disconnected
< disk access
@@ -2782,6 +2850,7 @@
< email usemail
< emerging pro rules
< emerging rules
+< enable
< enable smt
< encryption
< entropy
@@ -3117,6 +3186,7 @@
< mtu
< MTU settings
< nameserver
+< netbios nameserver daemon
< never
< no entries
< no hardware random number generator
@@ -3143,6 +3213,7 @@
< openvpn prefix openvpn subnet
< openvpn prefix remote subnet
< openvpn subnet is used
+< optional
< other
< our donors
< outgoing compression in bytes per second
@@ -3198,15 +3269,19 @@
< rdns
< received
< red1
+< required
< required field
< runmode
< samba join a domain
< samba join domain
+< samba server role member
+< samba server role standalone
< search
< sent
< server restart
< show dh
< show tls-auth key
+< smb daemon
< smt disabled
< smt enabled
< smt not supported
@@ -3310,6 +3385,7 @@
< uptime
< uptime load average
< urlfilter redirect template
+< user management
< vendor
< visit us at
< vpn broken
@@ -3331,6 +3407,7 @@
< vulnerable
< week-graph
< Weekly
+< winbind daemon
< wireless network
< wlanap
< wlanap auto
@@ -3424,6 +3501,8 @@
< Daily
< dangerous
< default IP address
+< desired
+< disable
< Disabled
< disconnected
< dns check servers
@@ -3447,6 +3526,7 @@
< email tls explicit
< email tls implicit
< emerging pro rules
+< enable
< enable smt
< error
< error the to date has to be later than the from date
@@ -3495,11 +3575,13 @@
< meltdown
< mitigated
< mtu
+< netbios nameserver daemon
< no entries
< not affected
< not validating
< okay
< open connections
+< optional
< ovpn connection name
< ovpn error dh
< ovpn error md5
@@ -3515,8 +3597,12 @@
< processor vulnerability mitigations
< ptr
< received
+< required
< runmode
+< samba server role member
+< samba server role standalone
< sent
+< smb daemon
< smt disabled
< smt enabled
< smt not supported
@@ -3536,12 +3622,14 @@
< taa zombieload2
< transport mode does not support vti
< update ruleset
+< user management
< vpn start action add
< vpn subjectaltname missing
< vpn wait
< vulnerability
< vulnerable
< Weekly
+< winbind daemon
< wlanap auto
< wlanap broadcast ssid
< wlanap client isolation
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 8ca32d675..1fec05c35 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -67,6 +67,7 @@ my %sections = (
'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )',
'pakfire' => '(pakfire:)',
'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])',
+ 'samba' => '(nmbd|smbd|winbind)\[\d+\]:',
'suricata' => '(suricata: )',
'squid' => '(squid\[.*\]: |squid: )',
'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
@@ -95,6 +96,7 @@ my %trsections = (
'openvpn' => 'OpenVPN',
'pakfire' => 'Pakfire',
'red' => 'RED',
+ 'samba' => $Lang::tr{'samba'},
'suricata' => "$Lang::tr{'intrusion detection'}",
'squid' => "$Lang::tr{'web proxy'}",
'ssh' => 'SSH',
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index d88a2ee47..be670a95e 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -32,100 +32,52 @@ my %sambasettings = ();
my %cgisettings = ();
my %checked = ();
my %netsettings = ();
-my %ovpnsettings = ();
my %color = ();
my %mainsettings = ();
my $message = "";
my $errormessage = "";
-my @Logs = qx(ls /var/log/samba/);
-my $Log =$Lang::tr{'no log selected'};
-
-my $Status = qx(/usr/local/bin/sambactrl smbstatus);
-$Status=~s/\n/<br \/>/g;
-
my $userentry = "";
my @user = ();
my @userline = ();
my $userfile = "${General::swroot}/samba/private/smbpasswd";
my %selected= () ;
-my $defaultoption= "[Share]\npath = /var/ipfire/samba/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\npublic = yes\nforce user = samba";
-my $defaultprinter= "[Printer]\ncomment = Printer public\npath = /var/spool/cups\nprinting = sysvn\nprintcap = lpstat\npublic = yes\nwritable = no\nprintable = yes";
-my %printer = ();
+my $defaultoption= "[My Share]\npath = \ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0644\ndirectory mask = 0755\npublic = yes\nforce user = samba";
my %shares = ();
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
-&General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings);
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
-my @ovpnnetwork = split(/\//,$ovpnsettings{'DOVPN_SUBNET'});
-my @ovpnip = split(/\./,$ovpnnetwork[0]);
-$ovpnip[3]=$ovpnip[3]+1;
-
-############################################################################################################################
-############################################# Samba Dienste fr Statusberprfung ##########################################
-
-my %servicenames = ('SMB Daemon' => 'smbd', 'NetBIOS Nameserver' => 'nmbd', 'Winbind Daemon' => 'winbindd');
-
-&Header::showhttpheaders();
-
############################################################################################################################
#################################### Initialisierung von Samba Variablen fr global Settings ###############################
-$sambasettings{'WORKGRP'} = 'homeip.net';
-$sambasettings{'NETBIOSNAME'} = 'IPFire';
-$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x';
-$sambasettings{'INTERFACES'} = '';
-$sambasettings{'SECURITY'} = 'user';
-$sambasettings{'OSLEVEL'} = '33';
-$sambasettings{'GREEN'} = 'on';
-$sambasettings{'BLUE'} = 'off';
-$sambasettings{'ORANGE'} = 'off';
-$sambasettings{'VPN'} = 'off';
-$sambasettings{'WINSSRV'} = '';
-$sambasettings{'WINSSUPPORT'} = 'on';
+$sambasettings{'WORKGRP'} = uc($mainsettings{'DOMAINNAME'});
+$sambasettings{'ROLE'} = 'standalone';
$sambasettings{'REMOTEANNOUNCE'} = '';
$sambasettings{'REMOTESYNC'} = '';
-$sambasettings{'PASSWORDSYNC'} = 'off';
-$sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
$sambasettings{'GUESTACCOUNT'} = 'samba';
$sambasettings{'MAPTOGUEST'} = 'Bad User';
-$sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2';
-$sambasettings{'SYSLOGLEVEL'} = '1';
-$sambasettings{'SYSLOGONLY'} = 'on';
-$sambasettings{'DOSCHARSET'} = 'CP850';
-$sambasettings{'UNIXCHARSET'} = 'UTF8';
-$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_KEEPALIVE';
-$sambasettings{'WIDELINKS'} = 'on';
-$sambasettings{'UNIXEXTENSION'} = 'off';
-$sambasettings{'SMB2'} = 'on';
+$sambasettings{'ENCRYPTION'} = 'optional';
### Values that have to be initialized
$sambasettings{'ACTION'} = '';
-### Samba CUPS Variablen
-$sambasettings{'LOADPRINTERS'} = 'Yes';
-$sambasettings{'PRINTING'} = 'cups';
-$sambasettings{'PRINTCAPNAME'} = 'cups';
my $LOGLINES = '50';
-################################################## Samba PDC Variablen #####################################################
-
-$sambasettings{'LOCALMASTER'} = 'off';
-$sambasettings{'DOMAINMASTER'} = 'off';
-$sambasettings{'PREFERREDMASTER'} = 'off';
-my $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`;
-
-
############################################################################################################################
&General::readhash("${General::swroot}/samba/settings", \%sambasettings);
-&Header::getcgihash(\%sambasettings);
-sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();}
+# Hook to regenerate the configuration files.
+if ($ENV{"REMOTE_ADDR"} eq "") {
+ &writeconfiguration();
+ exit(0);
+}
-if (($sambasettings{'WIDELINKS'} eq 'on') & ($sambasettings{'UNIXEXTENSION'} eq 'on'))
- {$errormessage = "$errormessage<br />Don't enable 'Wide links' and 'Unix extension' at the same time"; }
+&Header::showhttpheaders();
+
+&Header::getcgihash(\%sambasettings);
+delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasettings{'y'};
&Header::openpage('Samba', 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
@@ -133,252 +85,39 @@ if (($sambasettings{'WIDELINKS'} eq 'on') & ($sambasettings{'UNIXEXTENSION'} eq
############################################################################################################################
############################################# Samba Rootskript aufrufe fr SU-Actions #######################################
-if ($sambasettings{'ACTION'} eq 'smbuserdisable'){system("/usr/local/bin/sambactrl smbuserdisable $sambasettings{'NAME'}");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbuserenable'){system("/usr/local/bin/sambactrl smbuserenable $sambasettings{'NAME'}");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbuseradd'){system("/usr/local/bin/sambactrl smbuseradd $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbpcadd'){system("/usr/local/bin/sambactrl smbpcadd $sambasettings{'PCNAME'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbchangepw'){system("/usr/local/bin/sambactrl smbchangepw $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'}");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl smbrestart");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbreload'){system("/usr/local/bin/sambactrl smbreload");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'globalresetyes')
- {
- system("/usr/local/bin/sambactrl smbglobalreset");
- $sambasettings{'WORKGRP'} = 'homeip.net';
- $sambasettings{'NETBIOSNAME'} = 'IPFire';
- $sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x';
- $sambasettings{'INTERFACES'} = '';
- $sambasettings{'SECURITY'} = 'user';
- $sambasettings{'OSLEVEL'} = '65';
- $sambasettings{'GREEN'} = 'on';
- $sambasettings{'BLUE'} = 'off';
- $sambasettings{'ORANGE'} = 'off';
- $sambasettings{'VPN'} = 'off';
- $sambasettings{'WINSSRV'} = '';
- $sambasettings{'WINSSUPPORT'} = 'on';
- $sambasettings{'REMOTEANNOUNCE'} = '';
- $sambasettings{'REMOTESYNC'} = '';
- $sambasettings{'PASSWORDSYNC'} = 'off';
- $sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
- $sambasettings{'GUESTACCOUNT'} = 'samba';
- $sambasettings{'MAPTOGUEST'} = 'Bad User';
- $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2';
- $sambasettings{'SYSLOGLEVEL'} = '1';
- $sambasettings{'SYSLOGONLY'} = 'on';
- $sambasettings{'DOSCHARSET'} = 'CP850';
- $sambasettings{'UNIXCHARSET'} = 'UTF8';
-### Samba CUPS Variablen
- $sambasettings{'LOADPRINTERS'} = 'Yes';
- $sambasettings{'PRINTING'} = 'cups';
- $sambasettings{'PRINTCAPNAME'} = 'cups';
- $sambasettings{'PRINTERNAME'} = 'Printer';
-### Values that have to be initialized
- $sambasettings{'WIDELINKS'} = 'on';
- $sambasettings{'UNIXEXTENSION'} = 'off';
- $sambasettings{'ACTION'} = '';
- $sambasettings{'LOCALMASTER'} = 'off';
- $sambasettings{'DOMAINMASTER'} = 'off';
- $sambasettings{'PREFERREDMASTER'} = 'off';
- $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_KEEPALIVE';
- $sambasettings{'WIDELINKS'} = 'on';
- $sambasettings{'UNIXEXTENSION'} = 'off';
- $sambasettings{'SMB2'} = 'on';
- $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`;
- system("/usr/local/bin/sambactrl smbreload");
- refreshpage();
- }
-
+if ($sambasettings{'ACTION'} eq 'smbuserdisable'){system("/usr/local/bin/sambactrl smbuserdisable $sambasettings{'NAME'}");}
+if ($sambasettings{'ACTION'} eq 'smbuserenable'){system("/usr/local/bin/sambactrl smbuserenable $sambasettings{'NAME'}");}
+if ($sambasettings{'ACTION'} eq 'smbuseradd'){system("/usr/local/bin/sambactrl smbuseradd $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");}
+if ($sambasettings{'ACTION'} eq 'smbchangepw'){system("/usr/local/bin/sambactrl smbchangepw $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'}");}
+if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl smbrestart");}
+if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");}
+if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");}
+if ($sambasettings{'ACTION'} eq 'smbreload'){system("/usr/local/bin/sambactrl smbreload");}
if ($sambasettings{'ACTION'} eq 'join') {
$message .= &joindomain($sambasettings{'USERNAME'}, $sambasettings{'PASSWORD'});
}
-############################################################################################################################
-################################################ Sicherheitsabfrage für den Reset ##########################################
-
-if ($sambasettings{'ACTION'} eq 'globalreset')
- {
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr><td bgcolor='$color{'color20'}' colspan='3' align='center'><b>$Lang::tr{'resetglobals'}</b>
- <tr><td align='right' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- $Lang::tr{'yes'} <input type='image' alt='$Lang::tr{'yes'}' title='$Lang::tr{'yes'}' src='/images/edit-redo.png' />
- <input type='hidden' name='ACTION' value='globalresetyes' /></form></td>
- <td align='left' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='image' alt='$Lang::tr{'no'}' title='$Lang::tr{'no'}' src='/images/dialog-error.png' /> $Lang::tr{'no'}
- <input type='hidden' name='ACTION' value='cancel' /></form></td>
- </tr>
- </table>
-END
-;
-}
-
-if ($sambasettings{'ACTION'} eq 'sharesreset')
- {
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr><td bgcolor='$color{'color20'}' colspan='3' align='center'><b>$Lang::tr{'resetshares'}</b>
- <tr><td align='right' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- $Lang::tr{'yes'} <input type='image' alt='$Lang::tr{'yes'}' title='$Lang::tr{'yes'}' src='/images/edit-redo.png' />
- <input type='hidden' name='ACTION' value='sharesresetyes' /></form></td>
- <td align='left' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='image' alt='$Lang::tr{'no'}' title='$Lang::tr{'no'}' src='/images/dialog-error.png' /> $Lang::tr{'no'}
- <input type='hidden' name='ACTION' value='cancel' /></form></td>
- </tr>
- </table>
-END
-;
- }
-
############################################################################################################################
########################################### Samba Benutzer oder PC l�chen #################################################
-if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl smbuserdelete $sambasettings{'NAME'}");refreshpage();}
+if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl smbuserdelete $sambasettings{'NAME'}");}
############################################################################################################################
##################################### Umsetzen der Werte von Checkboxen und Dropdowns ######################################
-if ($sambasettings{'ACTION'} eq $Lang::tr{'save'})
-{
-$sambasettings{'INTERFACES'} = '';
-if ($sambasettings{'GREEN'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'GREEN_DEV'}";}
-if ($sambasettings{'BLUE'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'BLUE_DEV'}";}
-if ($sambasettings{'ORANGE'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'ORANGE_DEV'}";}
-if ($sambasettings{'VPN'} eq 'on'){$sambasettings{'INTERFACES'} .= " ";}
-if ($sambasettings{'OTHERINTERFACES'} ne ''){ $sambasettings{'INTERFACES'} .= " $sambasettings{'OTHERINTERFACES'}";}
-
############################################################################################################################
##################################### Schreiben settings und bersetzen fr smb.conf #######################################
-delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasettings{'y'};
-&General::writehash("${General::swroot}/samba/settings", \%sambasettings);
-
-if ($sambasettings{'PASSWORDSYNC'} eq 'on'){ $sambasettings{'PASSWORDSYNC'} = "true";} else { $sambasettings{'PASSWORDSYNC'} = "false";}
-if ($sambasettings{'WINSSUPPORT'} eq 'on'){ $sambasettings{'WINSSUPPORT'} = "true";$sambasettings{'WINSSRV'} = "";} else { $sambasettings{'WINSSUPPORT'} = "false";}
-if ($sambasettings{'LOCALMASTER'} eq 'on'){ $sambasettings{'LOCALMASTER'} = "true";} else { $sambasettings{'LOCALMASTER'} = "false";}
-if ($sambasettings{'DOMAINMASTER'} eq 'on'){ $sambasettings{'DOMAINMASTER'} = "true";} else { $sambasettings{'DOMAINMASTER'} = "false";}
-if ($sambasettings{'PREFERREDMASTER'} eq 'on'){ $sambasettings{'PREFERREDMASTER'} = "true";} else { $sambasettings{'PREFERREDMASTER'} = "false";}
-if ($sambasettings{'SYSLOGONLY'} eq 'on'){ $sambasettings{'SYSLOGONLY'} = "yes";} else { $sambasettings{'SYSLOGONLY'} = "no";}
-if ($sambasettings{'WIDELINKS'} eq 'on'){ $sambasettings{'WIDELINKS'} = "yes";} else { $sambasettings{'WIDELINKS'} = "no";}
-if ($sambasettings{'UNIXEXTENSION'} eq 'on'){ $sambasettings{'UNIXEXTENSION'} = "yes";} else { $sambasettings{'UNIXEXTENSION'} = "no";}
+if ($sambasettings{'ACTION'} eq $Lang::tr{'save'}) {
+ &General::writehash("${General::swroot}/samba/settings", \%sambasettings);
-############################################################################################################################
-############################################# Schreiben der Samba globals ##################################################
+ # Write configuration to file
+ &writeconfiguration();
- open (FILE, ">${General::swroot}/samba/global") or die "Can't save the global settings: $!";
- flock (FILE, 2);
-
-print FILE <<END
-# global.settings by IPFire Project
-
-[global]
-netbios name = $sambasettings{'NETBIOSNAME'}
-server string = $sambasettings{'SRVSTRING'}
-workgroup = $sambasettings{'WORKGRP'}
-realm = $mainsettings{'DOMAINNAME'}
-passdb backend = smbpasswd
-
-wide links = $sambasettings{'WIDELINKS'}
-unix extensions = $sambasettings{'UNIXEXTENSION'}
-END
-;
-
-if ($sambasettings{'SMB2'} eq 'on'){
- print FILE "max protocol = smb2\n";
+ system("/usr/local/bin/sambactrl smbreload");
}
-print FILE <<END
-keep alive = 30
-os level = $sambasettings{'OSLEVEL'}
-fstype = NTFS
-
-kernel oplocks = false
-map to guest = $sambasettings{'MAPTOGUEST'}
-smb ports = 445 139
-dos charset = $sambasettings{'DOSCHARSET'}
-unix charset = $sambasettings{'UNIXCHARSET'}
-
-security = $sambasettings{'SECURITY'}
-encrypt passwords = yes
-guest account = $sambasettings{'GUESTACCOUNT'}
-unix password sync = $sambasettings{'PASSWORDSYNC'}
-null passwords = yes
-
-bind interfaces only = true
-interfaces = $sambasettings{'INTERFACES'}
-socket options = $sambasettings{'SOCKETOPTIONS'}
-remote announce = $sambasettings{'REMOTEANNOUNCE'}
-remote browse sync = $sambasettings{'REMOTESYNC'}
-
-username level = 1
-wins support = $sambasettings{'WINSSUPPORT'}
-wins server = $sambasettings{'WINSSRV'}
-
-winbind separator = +
-winbind uid = 10000-20000
-winbind gid = 10000-20000
-winbind use default domain = yes
-
-log file = /var/log/samba/samba-log.%m
-pid directory = /var/run/
-log level = $sambasettings{'LOGLEVEL'}
-syslog = $sambasettings{'SYSLOGLEVEL'}
-syslog only = $sambasettings{'SYSLOGONLY'}
-
-preferred master = $sambasettings{'PREFERREDMASTER'}
-domain master = $sambasettings{'DOMAINMASTER'}
-local master = $sambasettings{'LOCALMASTER'}
-
-END
-;
-close FILE;
-
- if (-e "${General::swroot}/cups/enable"){
- open (FILE, ">>${General::swroot}/samba/global") or die "Can't save the global cups settings: $!";
- flock (FILE, 2);
- print FILE <<END
-load printers = $sambasettings{'LOADPRINTERS'}
-printing = $sambasettings{'PRINTING'}
-printcap name = $sambasettings{'PRINTCAPNAME'}
-
-END
-;
-close FILE;
- }
-
- if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' )
- {
- open (FILE, ">${General::swroot}/samba/pdc") or die "Can't save the pdc settings: $!";
- flock (FILE, 2);
- chomp $sambasettings{'PDCOPTIONS'};
- $sambasettings{'PDCOPTIONS'} =~ s/\r\n/\n/gi;
- $sambasettings{'PDCOPTIONS'} =~ s/^\n//gi;
- $sambasettings{'PDCOPTIONS'} =~ s/^\r//gi;
- $sambasettings{'PDCOPTIONS'} =~ s/^.\n//gi;
- $sambasettings{'PDCOPTIONS'} =~ s/^.\r//gi;
- print FILE <<END
-$sambasettings{'PDCOPTIONS'}
-END
-;
- close FILE;
- }
-
-if ( -e "/var/ipfire/cups/enable")
- {
- if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");refreshpage();}
- else {system("/usr/local/bin/sambactrl smbsafeconfcups");}
- }
-else
- {
- if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");refreshpage();}
- else{system("/usr/local/bin/sambactrl smbsafeconf");}
- }
-
-system("/usr/local/bin/sambactrl smbreload");refreshpage();
-}
- &General::readhash("${General::swroot}/samba/settings", \%sambasettings);
+&General::readhash("${General::swroot}/samba/settings", \%sambasettings);
if ($errormessage)
@@ -401,485 +140,351 @@ if ($message) {
############################################################################################################################
########################################## Aktivieren von Checkboxen und Dropdowns #########################################
-$checked{'SYSLOGONLY'}{'off'} = '';
-$checked{'SYSLOGONLY'}{'on'} = '';
-$checked{'SYSLOGONLY'}{$sambasettings{'SYSLOGONLY'}} = "checked='checked'";
-$checked{'WINSSUPPORT'}{'off'} = '';
-$checked{'WINSSUPPORT'}{'on'} = '';
-$checked{'WINSSUPPORT'}{$sambasettings{'WINSSUPPORT'}} = "checked='checked'";
-$checked{'PASSWORDSYNC'}{'off'} = '';
-$checked{'PASSWORDSYNC'}{'on'} = '';
-$checked{'PASSWORDSYNC'}{$sambasettings{'PASSWORDSYNC'}} = "checked='checked'";
-$checked{'LOCALMASTER'}{'off'} = '';
-$checked{'LOCALMASTER'}{'on'} = '';
-$checked{'LOCALMASTER'}{$sambasettings{'LOCALMASTER'}} = "checked='checked'";
-$checked{'DOMAINMASTER'}{'off'} = '';
-$checked{'DOMAINMASTER'}{'on'} = '';
-$checked{'DOMAINMASTER'}{$sambasettings{'DOMAINMASTER'}} = "checked='checked'";
-$checked{'PREFERREDMASTER'}{'off'} = '';
-$checked{'PREFERREDMASTER'}{'on'} = '';
-$checked{'PREFERREDMASTER'}{$sambasettings{'PREFERREDMASTER'}} = "checked='checked'";
-$checked{'WIDELINKS'}{'off'} = '';
-$checked{'WIDELINKS'}{'on'} = '';
-$checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} = "checked='checked'";
-$checked{'UNIXEXTENSION'}{'off'} = '';
-$checked{'UNIXEXTENSION'}{'on'} = '';
-$checked{'UNIXEXTENSION'}{$sambasettings{'UNIXEXTENSION'}} = "checked='checked'";
-$checked{'SMB2'}{'off'} = '';
-$checked{'SMB2'}{'on'} = '';
-$checked{'SMB2'}{$sambasettings{'SMB2'}} = "checked='checked'";
-$checked{'GREEN'}{'off'} = '';
-$checked{'GREEN'}{'on'} = '';
-$checked{'GREEN'}{$sambasettings{'GREEN'}} = "checked='checked'";
-$checked{'BLUE'}{'off'} = '';
-$checked{'BLUE'}{'on'} = '';
-$checked{'BLUE'}{$sambasettings{'BLUE'}} = "checked='checked'";
-$checked{'ORANGE'}{'off'} = '';
-$checked{'ORANGE'}{'on'} = '';
-$checked{'ORANGE'}{$sambasettings{'ORANGE'}} = "checked='checked'";
-$checked{'VPN'}{'off'} = '';
-$checked{'VPN'}{'on'} = '';
-$checked{'VPN'}{$sambasettings{'VPN'}} = "checked='checked'";
+$selected{'ENCRYPTION'}{'optional'} = '';
+$selected{'ENCRYPTION'}{'desired'} = '';
+$selected{'ENCRYPTION'}{'required'} = '';
+$selected{'ENCRYPTION'}{$sambasettings{'ENCRYPTION'}} = "selected='selected'";
+$selected{'ROLE'}{'standalone'} = '';
+$selected{'ROLE'}{'member'} = '';
+$selected{'ROLE'}{$sambasettings{'ROLE'}} = "selected='selected'";
if ( $sambasettings{'MAPTOGUEST'} eq "Never" ) {
$sambasettings{'MAPTOGUEST'}="Bad User";
}
$selected{'MAPTOGUEST'}{$sambasettings{'MAPTOGUEST'}} = "selected='selected'";
-$selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'";
############################################################################################################################
################################### Aufbau der HTML Seite fr globale Sambaeinstellungen ###################################
&Header::openbox('100%', 'center', $Lang::tr{'samba'});
-print <<END
-<br />
-<table width='95%' cellspacing='0'>
-<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'all services'}</b></td></tr>
-</table><table width='95%' cellspacing='0'>
-END
-;
-my $key = '';
-foreach $key (sort keys %servicenames)
- {
- print "<tr><td align='left' width='40%'>$key</td>";
- my $shortname = $servicenames{$key};
- my $status = &isrunning($shortname);
- print "$status</tr>";
- }
+my %servicenames = (
+ "nmbd" => $Lang::tr{'netbios nameserver daemon'},
+ "smbd" => $Lang::tr{'smb daemon'},
+ "winbindd" => $Lang::tr{'winbind daemon'},
+);
-print <<END
-</table>
-<br />
-<table width='95%' cellspacing='0'>
-<tr><td align='left' width='40%' />
-<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='smbstart' /><input type='image' alt='$Lang::tr{'smbstart'}' title='$Lang::tr{'smbstart'}' src='/images/go-up.png' /></form></td>
-<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='smbstop' /><input type='image' alt='$Lang::tr{'smbstop'}' title='$Lang::tr{'smbstop'}' src='/images/go-down.png' /></form></td>
-<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='smbrestart' /><input type='image' alt='$Lang::tr{'smbrestart'}' title='$Lang::tr{'smbrestart'}' src='/images/view-refresh.png' /></form></td></tr>
-</table>
-<br />
-<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<table width='95%' cellspacing='0'>
-<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'workgroup'}</td><td align='left'><input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'netbios name'}</td><td align='left'><input type='text' name='NETBIOSNAME' value='$sambasettings{'NETBIOSNAME'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'dos charset'}</td><td align='left'><input type='text' name='DOSCHARSET' value='$sambasettings{'DOSCHARSET'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'unix charset'}</td><td align='left'><input type='text' name='UNIXCHARSET' value='$sambasettings{'UNIXCHARSET'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'server string'}</td><td align='left'><input type='text' name='SRVSTRING' value='$sambasettings{'SRVSTRING'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'log level'}</td><td align='left'><input type='text' name='LOGLEVEL' value='$sambasettings{'LOGLEVEL'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>Sys$Lang::tr{'log level'}</td><td align='left'><input type='text' name='SYSLOGLEVEL' value='$sambasettings{'SYSLOGLEVEL'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>Syslog only</td><td align='left'>on <input type='radio' name='SYSLOGONLY' value='on' $checked{'SYSLOGONLY'}{'on'} />/
- <input type='radio' name='SYSLOGONLY' value='off' $checked{'SYSLOGONLY'}{'off'} /> off</td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'interfaces'}</td><td align='left'>on <input type='radio' name='VPN' value='on' $checked{'VPN'}{'on'} />/
- <input type='radio' name='VPN' value='off' $checked{'VPN'}{'off'} /> off |
- <font size='2' color='$Header::colourovpn'><b> OpenVpn - $ovpnip[0].$ovpnip[1].$ovpnip[2].$ovpnip[3]/$ovpnnetwork[1]</b></font></td></tr>
-<tr><td align='left' width='40%'></td><td align='left'>on <input type='radio' name='GREEN' value='on' $checked{'GREEN'}{'on'} />/
- <input type='radio' name='GREEN' value='off' $checked{'GREEN'}{'off'} /> off |
- <font size='2' color='$Header::colourgreen'><b> $Lang::tr{'green'} - $netsettings{'GREEN_DEV'}</b></font></td></tr>
+print <<END;
+ <table class="tbl" width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'all services'}</b></td>
+ </tr>
END
-;
-if (&Header::blue_used())
- {
- print <<END
- <tr><td align='left' width='40%'></td><td align='left'>on <input type='radio' name='BLUE' value='on' $checked{'BLUE'}{'on'} />/
- <input type='radio' name='BLUE' value='off' $checked{'BLUE'}{'off'} /> off |
- <font size='2' color='$Header::colourblue'><b> $Lang::tr{'wireless'} - $netsettings{'BLUE_DEV'}</b></font></td></tr>
-END
-;
- }
+foreach my $service (sort keys %servicenames) {
+ my $status = &isrunning($service);
-if (&Header::orange_used())
- {
- print <<END
- <tr><td align='left' width='40%'></td><td align='left'>on <input type='radio' name='ORANGE' value='on' $checked{'ORANGE'}{'on'} />/
- <input type='radio' name='ORANGE' value='off' $checked{'ORANGE'}{'off'} /> off |
- <font size='2' color='$Header::colourorange'><b> $Lang::tr{'dmz'} - $netsettings{'ORANGE_DEV'}</b></font></td></tr>
+ print <<END;
+ <tr>
+ <td align='left' width='40%'>$servicenames{$service}</td>
+ $status
+ </tr>
END
-;
- }
+}
print <<END
-<tr><td align='center' width='40%'>$Lang::tr{'more'}</td><td align='left'><input type='text' name='OTHERINTERFACES' value='$sambasettings{'OTHERINTERFACES'}' size="30" /></td></tr>
-<tr><td align='left'><br /></td><td></td></tr>
-<tr><td align='left' width='40%'>Wide links</td><td align='left'>on <input type='radio' name='WIDELINKS' value='on' $checked{'WIDELINKS'}{'on'} />/
- <input type='radio' name='WIDELINKS' value='off' $checked{'WIDELINKS'}{'off'} /> off</td></tr>
-<tr><td align='left' width='40%'>Unix extension</td><td align='left'>on <input type='radio' name='UNIXEXTENSION' value='on' $checked{'UNIXEXTENSION'}{'on'} />/
- <input type='radio' name='UNIXEXTENSION' value='off' $checked{'UNIXEXTENSION'}{'off'} /> off</td></tr>
-<tr><td align='left' width='40%'>SMB2 $Lang::tr{'protocol'}</td><td align='left'>on <input type='radio' name='SMB2' value='on' $checked{'SMB2'}{'on'} />/
- <input type='radio' name='SMB2' value='off' $checked{'SMB2'}{'off'} /> off</td></tr>
-<tr><td align='left'><br /></td><td></td></tr>
-<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'security options'}</b></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'security'}</td><td align='left'><select name='SECURITY' style="width: 165px">
- <option value='user' $selected{'SECURITY'}{'user'}>User</option>
- <option value='domain' $selected{'SECURITY'}{'domain'}>Domain</option>
- <option value='ADS' $selected{'SECURITY'}{'ADS'}>ADS</option>
- <option value='server' $selected{'SECURITY'}{'server'}>Server</option>
- </select></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'map to guest'}</td><td align='left'><select name='MAPTOGUEST' style="width: 165px">
- <option value='Bad User' $selected{'MAPTOGUEST'}{'Bad User'}>Bad User</option>
- <option value='Bad Password' $selected{'MAPTOGUEST'}{'Bad Password'}>Bad Password</option>
- </select></td></tr>
-END
-;
-#<tr><td align='left' width='40%'>$Lang::tr{'unix password sync'}</td><td align='left'>on <input type='radio' name='PASSWORDSYNC' value='on' $checked{'PASSWORDSYNC'}{'on'} />/
-# <input type='radio' name='PASSWORDSYNC' value='off' $checked{'PASSWORDSYNC'}{'off'} /> off</td></tr>
-print <<END
-<tr><td align='left'><br /></td><td /></tr>
-<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'network options'}</b></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'os level'}</td><td align='left'><input type='text' name='OSLEVEL' value='$sambasettings{'OSLEVEL'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'socket options'}</td><td align='left'><input type='text' name='SOCKETOPTIONS' value='$sambasettings{'SOCKETOPTIONS'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'remote announce'}</td><td align='left'><input type='text' name='REMOTEANNOUNCE' value='$sambasettings{'REMOTEANNOUNCE'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'remote browse sync'}</td><td align='left'><input type='text' name='REMOTESYNC' value='$sambasettings{'REMOTESYNC'}' size="30" /></td></tr>
-END
-;
-if ($sambasettings{'WINSSUPPORT'} eq 'off') {print"<tr><td align='left' width='40%'>$Lang::tr{'wins server'}</td><td align='left'><input type='text' name='WINSSRV' value='$sambasettings{'WINSSRV'}' size='30' /></td></tr>";}
- print <<END
-<tr><td align='left' width='40%'>$Lang::tr{'wins support'}</td><td align='left'>on <input type='radio' name='WINSSUPPORT' value='on' $checked{'WINSSUPPORT'}{'on'} />/
- <input type='radio' name='WINSSUPPORT' value='off' $checked{'WINSSUPPORT'}{'off'} /> off</td></tr>
-END
-;
-
-if ($sambasettings{'SECURITY'} eq 'user')
- {
- print <<END
-<tr><td align='left' width='40%'>$Lang::tr{'local master'}</td><td align='left'>on <input type='radio' name='LOCALMASTER' value='on' $checked{'LOCALMASTER'}{'on'} />/
- <input type='radio' name='LOCALMASTER' value='off' $checked{'LOCALMASTER'}{'off'} /> off</td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'domain master'}</td><td align='left'>on <input type='radio' name='DOMAINMASTER' value='on' $checked{'DOMAINMASTER'}{'on'} />/
- <input type='radio' name='DOMAINMASTER' value='off' $checked{'DOMAINMASTER'}{'off'} /> off</td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'prefered master'}</td><td align='left'>on <input type='radio' name='PREFERREDMASTER' value='on' $checked{'PREFERREDMASTER'}{'on'} />/
- <input type='radio' name='PREFERREDMASTER' value='off' $checked{'PREFERREDMASTER'}{'off'} /> off</td></tr>
-END
-;
- }
+ </table>
-if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'on')
- {
- print <<END
- <tr><td align='left'><br /></td><td></td></tr>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'pdc options'}</b></td></tr>
- <tr><td align='left'><br /></td><td></td></tr>
- <tr><td colspan='2' align='center'><textarea name="PDCOPTIONS" cols="50" rows="15" Wrap="off">$PDCOPTIONS</textarea></td></tr>
-END
-;
- }
-
- if ( -e "/var/ipfire/cups/enable")
- {
- print <<END
- <tr><td align='left'><br /></td><td></td></tr>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'printing options'}</b></td></tr>
- <tr><td align='left' width='40%'>$Lang::tr{'load printer'}</td><td align='left'><input type='text' name='LOADPRINTERS' value='$sambasettings{'LOADPRINTERS'}' size="30" /></td></tr>
- <tr><td align='left' width='40%'>$Lang::tr{'printing'}</td><td align='left'><input type='text' name='PRINTING' value='$sambasettings{'PRINTING'}' size="30" /></td></tr>
- <tr><td align='left' width='40%'>$Lang::tr{'printcap name'}</td><td align='left'><input type='text' name='PRINTCAPNAME' value='$sambasettings{'PRINTCAPNAME'}' size="30" /></td></tr>
-END
-;
- }
+ <br>
+
+ <table width="100%">
+ <td width="33%" align="center">
+ <form method="POST" action="$ENV{'SCRIPT_NAME'}">
+ <input type="hidden" name="ACTION" value="smbstart">
+ <input type="submit" value="$Lang::tr{'enable'}">
+ </form>
+ </td>
+
+ <td width="33%" align="center">
+ <form method="POST" action="$ENV{'SCRIPT_NAME'}">
+ <input type="hidden" name="ACTION" value="smbstop">
+ <input type="submit" value="$Lang::tr{'disable'}">
+ </form>
+ </td>
+
+ <td width="33%" align="center">
+ <form method="POST" action="$ENV{'SCRIPT_NAME'}">
+ <input type="hidden" name="ACTION" value="smbrestart">
+ <input type="submit" value="$Lang::tr{'restart'}">
+ </form>
+ </td>
+ </table>
-print <<END
-</table>
-<br />
-<table width='10%' cellspacing='0'>
-<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='ACTION' value=$Lang::tr{'save'} />
- <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></form></td>
-<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='ACTION' value='globalreset' />
- <input type='image' alt='$Lang::tr{'reset'}' title='$Lang::tr{'reset'}' src='/images/reload.gif' /></form></td>
-<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='ACTION' value='globalcaption' />
- <input type='image' alt='$Lang::tr{'caption'}' title='$Lang::tr{'caption'}' src='/images/help-browser.png' /></form></td></tr>
-</table>
-END
-;
+ <br>
+
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <table class="tbl" width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'workgroup'}</td>
+ <td align='left'>
+ <input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}' size="30" />
+ </td>
+ </tr>
+ <tr>
+ <td align='left'><br /></td>
+ <td></td>
+ </tr>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'security options'}</b></td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'security'}</td>
+ <td align='left'>
+ <select name='ROLE' style="width: 165px">
+ <option value='standalone' $selected{'ROLE'}{'standalone'}>$Lang::tr{'samba server role standalone'}</option>
+ <option value='member' $selected{'ROLE'}{'member'}>$Lang::tr{'samba server role member'}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'encryption'}</td>
+ <td align='left'>
+ <select name='ENCRYPTION' style="width: 165px">
+ <option value='optional' $selected{'ENCRYPTION'}{'optional'}>$Lang::tr{'optional'}</option>
+ <option value='desired' $selected{'ENCRYPTION'}{'desired'}>$Lang::tr{'desired'}</option>
+ <option value='required' $selected{'ENCRYPTION'}{'required'}>$Lang::tr{'required'}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'map to guest'}</td>
+ <td align='left'>
+ <select name='MAPTOGUEST' style="width: 165px">
+ <option value='Bad User' $selected{'MAPTOGUEST'}{'Bad User'}>Bad User</option>
+ <option value='Bad Password' $selected{'MAPTOGUEST'}{'Bad Password'}>Bad Password</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align='left'><br /></td>
+ <td></td>
+ </tr>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'network options'}</b></td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'remote announce'}</td>
+ <td align='left'>
+ <input type='text' name='REMOTEANNOUNCE' value='$sambasettings{'REMOTEANNOUNCE'}' size="30" />
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'remote browse sync'}</td>
+ <td align='left'>
+ <input type='text' name='REMOTESYNC' value='$sambasettings{'REMOTESYNC'}' size="30" />
+ </td>
+ </tr>
+ </table>
-if ($sambasettings{'ACTION'} eq 'globalcaption')
- {
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
- <tr><td align='right' width='33%'><img src='/images/media-floppy.png' /></td><td align='left'>$Lang::tr{'save settings'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/reload.gif' /></td><td align='left'>$Lang::tr{'restore settings'}</td></tr>
- </table>
+ <br>
+
+ <table width='100%' cellspacing='0'>
+ <tr>
+ <td align='center'>
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='ACTION' value="$Lang::tr{'save'}">
+ <input type='submit' value="$Lang::tr{'save'}">
+ </form>
+ </td>
+ </tr>
+ </table>
END
;
- }
&Header::closebox();
############################################################################################################################
########################################## Benutzerverwaltung fr Usersecurity #############################################
-if ($sambasettings{'SECURITY'} eq 'user')
- {
- if ($sambasettings{'DOMAINMASTER'} eq 'off')
- {
- &Header::openbox('100%', 'center', $Lang::tr{'accounting user nonpdc'});
- }
- else
- {
- &Header::openbox('100%', 'center', $Lang::tr{'accounting user pdc'});
- }
- print <<END
- <a name="$Lang::tr{'accounting'}"></a>
- <br />
- <table width='95%' cellspacing='0'>
- <tr><td colspan='6' align='left'></td></tr>
- <tr><td bgcolor='$color{'color20'}' colspan='7' align='left'><b>$Lang::tr{'accounting'}</b></td></tr>
- <tr><td align='left'><u>$Lang::tr{'username'}</u></td><td align='left'><u>$Lang::tr{'password'}</u></td>
-END
-;
+if ($sambasettings{'ROLE'} eq 'standalone') {
+ &Header::openbox('100%', 'center', $Lang::tr{'user management'});
- if ($sambasettings{'DOMAINMASTER'} eq 'off')
- {
- print "<td></td>";
- }
- else
- {
- print "<td align='left'><u>$Lang::tr{'type'}</u></td>";
- }
+ print <<END;
+ <table class="tbl" width='100%' cellspacing='0'>
+ <tr>
+ <th align='left'>$Lang::tr{'user'}</th>
+ <th colspan='3' width='5%'></th>
+ </tr>
+END
- print "<td align='left'><u>$Lang::tr{'status'}</u></td><td colspan='3' width='5%' align='center'><u>$Lang::tr{'options'}</u></td></tr>";
system('/usr/local/bin/sambactrl readsmbpasswd');
open(FILE, "<${General::swroot}/samba/private/smbpasswd") or die "Can't read user file: $!";
- @user = <FILE>;
+ my @users = <FILE>;
close(FILE);
system('/usr/local/bin/sambactrl locksmbpasswd');
-
- my $lines = 0;
-
- foreach $userentry (sort @user)
- {
- @userline = split( /\:/, $userentry );
- if ($lines % 2) {print "<tr bgcolor='$color{'color20'}'>";} else {print "<tr bgcolor='$color{'color22'}'>";}
- print "<td align='left'>$userline[0]</td><td align='left'>";
- if ($userline[4] =~ /N/)
- {
- print "$Lang::tr{'not set'}</td><td align='left'>";
- }
- else
- {
- print "$Lang::tr{'set'}</td><td align='left'>";
- }
- if ($sambasettings{'DOMAINMASTER'} eq 'off')
- {
- print "</td><td align='left'>";
- }
- else
- {
- if ($userline[0] =~ /\$/)
- {
- print "$Lang::tr{'pc'}</td><td align='left'>";
- }
- else
- {
- print "$Lang::tr{'user'}</td><td align='left'>";
- }
- }
+ my $lines = 0;
+ foreach $userentry (sort @users) {
+ @userline = split( /\:/, $userentry);
- if ($userline[4] =~ /D/)
- {
- print <<END
- $Lang::tr{'inactive'}</td>
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <input type='hidden' name='NAME' value='$userline[0]' />
- <input type='hidden' name='ACTION' value='smbuserenable' />
- <input type='image' alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' />
- </form></td>
-END
-;
- }
- else
- {
- print <<END
- $Lang::tr{'active'}</td>
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <input type='hidden' name='NAME' value='$userline[0]' />
- <input type='hidden' name='ACTION' value='smbuserdisable' />
- <input type='image' alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' />
- </form></td>
-END
-;
- }
+ if ($lines % 2) {
+ print "<tr bgcolor='$color{'color20'}'>";
+ } else {
+ print "<tr bgcolor='$color{'color22'}'>";
+ }
- if ($userline[0] =~ /\$/)
- {
- print "<td></td>";
- }
- else
- {
- print <<END
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <input type='hidden' name='NAME' value='$userline[0]' />
- <input type='hidden' name='ACTION' value='userchangepw' />
- <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
- </form></td>
-END
-;
- }
+ # Print username
+ print "<td align='left'>$userline[0]</td>";
- if ($sambasettings{'DOMAINMASTER'} eq 'on' && $userline[0] =~ /\$/)
- {
- print <<END
- <td><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
+ if ($userline[4] =~ /D/) {
+ print <<END;
+ <td align='center'>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='NAME' value='$userline[0]' />
- <input type='hidden' name='ACTION' value='userdelete' />
- <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/network-error.png' />
- </form></td></tr>
-END
-;
- }
- else
- {
- print <<END
- <td><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
+ <input type='hidden' name='ACTION' value='smbuserenable' />
+ <input type='image' alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' />
+ </form>
+ </td>
+END
+ } else {
+ print <<END;
+ <td align='center'>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='NAME' value='$userline[0]' />
- <input type='hidden' name='ACTION' value='userdelete' />
- <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-option-remove.png' />
- </form></td></tr>
+ <input type='hidden' name='ACTION' value='smbuserdisable' />
+ <input type='image' alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' />
+ </form>
+ </td>
END
-;
- }
- $lines++;
}
- print <<END
- </table>
- <br />
- <table width='10%' cellspacing='0'>
- <tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <input type='hidden' name='ACTION' value='useradd' />
- <input type='image' alt='$Lang::tr{'add user'}' title='$Lang::tr{'add user'}' src='/images/user-option-add.png' /></form></td>
-END
-;
- if ($sambasettings{'DOMAINMASTER'} eq 'on')
- {
- print <<END
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <input type='hidden' name='ACTION' value='pcadd' />
- <input type='image' alt='$Lang::tr{'pc add'}' title='$Lang::tr{'pc add'}' src='/images/network.png' /></form>
+ # Machine accounts can't be edited
+ if ($userline[0] =~ /\$/) {
+ print "<td></td>";
+ } else {
+ print <<END;
+ <td align='center'>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='NAME' value='$userline[0]' />
+ <input type='hidden' name='ACTION' value='userchangepw' />
+ <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
+ </form>
+ </td>
END
-;
}
- print <<END
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <input type='hidden' name='ACTION' value='usercaption' />
- <input type='image' alt='$Lang::tr{'caption'}' title='$Lang::tr{'caption'}' src='/images/help-browser.png' /></form>
- </td></tr>
- </table>
+
+ print <<END;
+ <td align='center'>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='NAME' value='$userline[0]' />
+ <input type='hidden' name='ACTION' value='userdelete' />
+ <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
+ </form>
+ </td>
+ </tr>
END
-;
+ $lines++;
+ }
- if ($sambasettings{'ACTION'} eq 'usercaption')
- {
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
- <tr><td align='right' width='33%'><img src='/images/user-option-add.png' /></td><td align='left'>$Lang::tr{'add user'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/network.png' /></td><td align='left'>$Lang::tr{'pc add'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/user-option-remove.png' /></td><td align='left'>$Lang::tr{'delete user'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/network-error.png' /></td><td align='left'>$Lang::tr{'delete pc'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/off.gif' /></td><td align='left'>$Lang::tr{'activate user'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/on.gif' /></td><td align='left'>$Lang::tr{'deactivate user'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/edit.gif' /></td><td align='left'>$Lang::tr{'change passwords'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/media-floppy.png' /></td><td align='left'>$Lang::tr{'save config'}</td></tr>
+ print <<END;
</table>
-END
-;
- }
- if ($sambasettings{'ACTION'} eq 'userchangepw')
- {
- my $username = "$sambasettings{'NAME'}";
- my $password = 'samba';
- print <<END
- <br />
- <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'change passwords'}</b></td></tr>
- <tr><td align='left'>$Lang::tr{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' readonly='readonly' /></td></tr>
- <tr><td align='left'>$Lang::tr{'password'}</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr>
- <tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbchangepw' />
- <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></td></tr>
+ <br>
+
+ <table width='10%' cellspacing='0'>
+ <tr>
+ <td align='center'>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='ACTION' value='useradd'>
+ <input type='submit' value='$Lang::tr{'add user'}'>
+ </form>
+ </td>
+ </tr>
</table>
- </form>
END
-;
- }
- if ($sambasettings{'ACTION'} eq 'useradd')
- {
+ if ($sambasettings{'ACTION'} eq 'userchangepw') {
+ my $username = $sambasettings{'NAME'};
+ my $password = 'samba';
+
+ print <<END
+ <br>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <table width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'change passwords'}</b></td>
+ </tr>
+ <tr>
+ <td align='left'>$Lang::tr{'username'}</td>
+ <td>
+ <input type='text' name='USERNAME' value='$username' size='30' readonly='readonly' />
+ </td>
+ </tr>
+ <tr>
+ <td align='left'>$Lang::tr{'password'}</td>
+ <td>
+ <input type='password' name='PASSWORD' value='$password' size='30' />
+ </td>
+ </tr>
+ <tr>
+ <td colspan='2' align='center'>
+ <input type='hidden' name='ACTION' value='smbchangepw'>
+ <input type='submit' value='$Lang::tr{'save'}'>
+ </td>
+ </tr>
+ </table>
+ </form>
+END
+ }
+
+ if ($sambasettings{'ACTION'} eq 'useradd') {
my $username = "user";
my $password = "samba";
chomp $username;
$username=~s/\s//g;
chomp $password;
$password=~s/\s//g;
- print <<END
- <br />
- <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'add user'}</b></td></tr>
- <tr><td align='left'>$Lang::tr{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' /></td></tr>
- <tr><td align='left'>$Lang::tr{'password'}</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr>
- <tr><td align='left'>$Lang::tr{'unix group'}</td><td><input type='text' name='GROUP' value='sambauser' size='30' /></td></tr>
- <tr><td align='left'>$Lang::tr{'unix shell'}</td><td><input type='text' name='SHELL' value='/bin/false' size='30' /></td></tr>
- <tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbuseradd' />
- <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></td></tr>
- </table>
- </form>
-END
-;
- }
- if ($sambasettings{'ACTION'} eq 'pcadd')
- {
- my $pcname = "client\$";
- chomp $pcname;
- $pcname=~s/\s//g;
- print <<END
- <br />
- <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'pc add'}</b></td></tr>
- <tr><td align='left'>$Lang::tr{'client'}</td><td><input type='text' name='PCNAME' value='$pcname' size='30' /></td></tr>
- <tr><td align='left'>$Lang::tr{'unix group'}</td><td><input type='text' name='GROUP' value='sambawks' size='30' /></td></tr>
- <tr><td align='left'>$Lang::tr{'unix shell'}</td><td><input type='text' name='SHELL' value='/bin/false' size='30' /></td></tr>
- <tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbpcadd' />
- <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></td></tr>
- </table>
- </form>
+ print <<END;
+ <br>
+
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <table width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'add user'}</b></td>
+ </tr>
+ <tr>
+ <td align='left'>$Lang::tr{'username'}</td>
+ <td>
+ <input type='text' name='USERNAME' value='$username' size='30' />
+ </td>
+ </tr>
+ <tr>
+ <td align='left'>$Lang::tr{'password'}</td>
+ <td>
+ <input type='password' name='PASSWORD' value='$password' size='30' />
+ </td>
+ </tr>
+ <tr>
+ <td align='left'>$Lang::tr{'unix group'}</td>
+ <td>
+ <input type='text' name='GROUP' value='sambauser' size='30' />
+ </td>
+ </tr>
+ <tr>
+ <td align='left'>$Lang::tr{'unix shell'}</td>
+ <td>
+ <input type='text' name='SHELL' value='/bin/false' size='30' />
+ </td>
+ </tr>
+ <tr>
+ <td colspan='2' align='center'>
+ <input type='hidden' name='ACTION' value='smbuseradd'>
+ <input type='submit' value='$Lang::tr{'save'}'>
+ </td>
+ </tr>
+ </table>
+ </form>
END
-;
- }
+ }
-&Header::closebox();
+ &Header::closebox();
}
-if ($sambasettings{'SECURITY'} eq "ADS") {
+if ($sambasettings{'ROLE'} eq "member") {
&Header::openbox('100%', 'center', $Lang::tr{'samba join a domain'});
my $AD_DOMAINNAME = uc($mainsettings{'DOMAINNAME'});
@@ -888,7 +493,7 @@ if ($sambasettings{'SECURITY'} eq "ADS") {
<form method="POST" action="$ENV{'SCRIPT_NAME'}">
<input type="hidden" name="ACTION" value="join">
- <table width="95%">
+ <table width="100%">
<tbody>
<tr>
<td width="40%">
@@ -935,130 +540,120 @@ END
my %shares = config("${General::swroot}/samba/shares");
-
-print <<END
-<a name="$Lang::tr{'manage shares'}"></a>
-<br />
-<table width='95%' cellspacing='0' class='tbl'>
-<tr><th bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'manage shares'}</b></th></tr>
-<tr><th align='left'><u>$Lang::tr{'sharename'}</u></th><th colspan='2' width="5%" align='center'><u>$Lang::tr{'options'}</u></th></tr>
+print <<END;
+ <table class="tbl" width='100%' cellspacing='0'>
+ <tr>
+ <th align='left'>$Lang::tr{'sharename'}</th>
+ <th colspan='2' width="5%" align='center'></th>
+ </tr>
END
-;
-my @Shares = keys(%shares);
+my @shares = keys(%shares);
my $lines = 0;
my $col="";
-foreach my $shareentry (sort @Shares)
- {
+foreach my $shareentry (sort @shares) {
chomp $shareentry;
+
if ($lines % 2) {
- print "<tr>";
- $col="bgcolor='$color{'color20'}'";
+ $col = "bgcolor='$color{'color20'}'";
} else {
- print "<tr>";
- $col="bgcolor='$color{'color22'}'";
- }
- print <<END
- <td align='left' $col>$shareentry</td>
- <td $col><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='NAME' value='$shareentry' />
- <input type='hidden' name='ACTION' value='sharechange' />
- <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
- </form></td>
- <td $col><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='NAME' value='$shareentry' />
- <input type='hidden' name='ACTION' value='smbsharedel' />
- <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
- </form></td></tr>
-END
-;
- $lines++;
+ $col = "bgcolor='$color{'color22'}'";
}
-print <<END
-</table>
-<br />
-<table width='10%' cellspacing='0'>
-<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='ACTION' value='shareadd' />
- <input type='image' alt='$Lang::tr{'add share'}' title='$Lang::tr{'add share'}' src='/images/list-add.png' />
- </form></td>
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='ACTION' value='sharesreset' />
- <input type='image' alt='$Lang::tr{'reset'}' title='$Lang::tr{'reset'}' src='/images/reload.gif' />
- </form></td>
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='ACTION' value='sharecaption' />
- <input type='image' alt='$Lang::tr{'caption'}' title='$Lang::tr{'caption'}' src='/images/help-browser.png' />
- </form></td>
-</tr>
-</table>
-END
-;
+ print <<END;
+ <tr>
+ <td align='left' $col>$shareentry</td>
+ <td $col>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
+ <input type='hidden' name='NAME' value='$shareentry' />
+ <input type='hidden' name='ACTION' value='sharechange' />
+ <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
+ </form>
+ </td>
+ <td $col>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
+ <input type='hidden' name='NAME' value='$shareentry' />
+ <input type='hidden' name='ACTION' value='smbsharedel' />
+ <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
+ </form>
+ </td>
+ </tr>
+END
+;
+ $lines++;
+}
-if ($sambasettings{'ACTION'} eq 'sharecaption')
- {
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
- <tr><td align='right' width='33%'><img src='/images/list-add.png' /></td><td align='left'>$Lang::tr{'add share'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/edit.gif' /></td><td align='left'>$Lang::tr{'edit share'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/media-floppy.png' /></td><td align='left'>$Lang::tr{'save config'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/reload.gif' /></td><td align='left'>$Lang::tr{'reset shares'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/user-trash.png' /></td><td align='left'>$Lang::tr{'delete share'}</td></tr>
+print <<END;
</table>
-END
-;
- }
-if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optioncaption' )
- {
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'add share'}</b></td></tr>
- <tr><td colspan='2' align='center'></td></tr>
- <tr><td colspan='2' align='center'>$Lang::tr{'show share options'}
- <a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></td></tr>
- <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'><tr><td colspan='2' align='center'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$defaultoption</textarea></td></tr>
- </table>
- <br />
- <table width='10%' cellspacing='0'>
- <tr><td align='center'><input type='hidden' name='ACTION' value='smbshareadd' />
- <input type='image' alt='$Lang::tr{'add share'}' title='$Lang::tr{'add share'}' src='/images/media-floppy.png' /></td></tr></form>
+ <br>
+
+ <table width='100%' cellspacing='0'>
+ <tr>
+ <td align='center'>
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='ACTION' value='shareadd'>
+ <input type='submit' value='$Lang::tr{'add share'}'>
+ </form>
+ </td>
+ </tr>
</table>
END
-;
- }
-if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'optioncaption2' )
- {
+if ($sambasettings{'ACTION'} eq 'shareadd') {
+ print <<END;
+ <br />
+
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <table width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td align='left'><b>$Lang::tr{'add share'}</b></td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <textarea name="SHAREOPTION" cols="121" rows="15">$defaultoption</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <input type='hidden' name='ACTION' value='smbshareadd'>
+ <input type='submit' value='$Lang::tr{'save'}'>
+ </td>
+ </tr>
+ </table>
+ </form>
+END
+}
+
+if ($sambasettings{'ACTION'} eq 'sharechange') {
my $shareoption = $shares{$sambasettings{'NAME'}};
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'edit share'}</b></td></tr>
- <tr><td colspan='2' align='center'></td></tr>
- <tr><td colspan='2' align='center'>$Lang::tr{'show share options'}<a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></td></tr>
- <tr><td colspan='2' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$shareoption</textarea></td></tr>
- </table>
- <br />
- <table width='10%' cellspacing='0'>
- <tr><td align='center'><input type='hidden' name='NAME' value='$sambasettings{'NAME'}' />
- <input type='image' alt='$Lang::tr{'change share'}' title='$Lang::tr{'change share'}' src='/images/media-floppy.png' />
- <input type='hidden' name='ACTION' value='smbsharechange' /></form></td></tr>
- </table>
+
+ print <<END;
+ <br />
+
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='NAME' value='$sambasettings{'NAME'}'>
+
+ <table width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td align='left'><b>$Lang::tr{'edit share'}</b></td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <textarea name="SHAREOPTION" cols="121" rows="15">$shareoption</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <input type='hidden' name='ACTION' value='smbsharechange'>
+ <input type='submit' value='$Lang::tr{'save'}'>
+ </td>
+ </tr>
+ </table>
+ </form>
END
-;
- }
+}
-if ($sambasettings{'ACTION'} eq 'sharesresetyes')
- {
- system('/usr/local/bin/sambactrl smbsharesreset');
- my $shares = config("${General::swroot}/samba/shares");
- system("/usr/local/bin/sambactrl smbreload");
- }
if ($sambasettings{'ACTION'} eq 'smbshareadd')
{
$shares{'xvx'}= "$sambasettings{'SHAREOPTION'}";
@@ -1080,180 +675,22 @@ if ($sambasettings{'ACTION'} eq 'smbsharechange')
&Header::closebox();
-############################################################################################################################
-################################################ Verwalten von Druckern ####################################################
-
-my %printer = config("${General::swroot}/samba/printer");
-
-if ( -e "/var/ipfire/cups/enable")
-{
-&Header::openbox('100%', 'center', $Lang::tr{'printer'});
-
-my @Printers = keys(%printer);
-print <<END
-<a name="$Lang::tr{'manage printers'}"></a>
-<br />
-<table width='95%' cellspacing='0'>
-<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'manage printers'}</b>
-<tr><td align='left'><u>$Lang::tr{'printername'}</u></td><td colspan='2' width="5%" align='center'><u>$Lang::tr{'options'}</u></td></tr>
-END
-;
-foreach my $printerentry (sort @Printers)
- {
- chomp $printerentry;
- print <<END
- <tr><td align='left'>$printerentry</td>
- <td><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
- <input type='hidden' name='NAME' value='$printerentry' />
- <input type='hidden' name='ACTION' value='printerchange' />
- <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
- </form></td>
- <td><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
- <input type='hidden' name='NAME' value='$printerentry' />
- <input type='hidden' name='ACTION' value='smbprinterdel' />
- <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
- </form></td></tr>
-END
-;
- }
-print <<END
-</table>
-<br />
-<table width='10%' cellspacing='0'>
-<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
- <input type='hidden' name='ACTION' value='printeradd' />
- <input type='image' alt='$Lang::tr{'add printer'}' title='$Lang::tr{'add printer'}' src='/images/list-add.png' />
- </form></td>
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
- <input type='hidden' name='ACTION' value='printereset' />
- <input type='image' alt='$Lang::tr{'reset'}' title='$Lang::tr{'reset'}' src='/images/reload.gif' />
- </form></td>
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
- <input type='hidden' name='ACTION' value='printercaption' />
- <input type='image' alt='$Lang::tr{'caption'}' title='$Lang::tr{'caption'}' src='/images/help-browser.png' />
- </form></td>
-</tr>
-</table>
-END
-;
-
-if ($sambasettings{'ACTION'} eq 'printeradd' || $sambasettings{'ACTION'} eq 'printercaption' )
- {
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'add printer'}</b></td></tr>
- <tr><td colspan='2' align='center'></td></tr>
- <tr><td colspan='2' align='center'>$Lang::tr{'show share options'}
- <a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></td></tr>
- <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'><tr><td colspan='2' align='center'><textarea name="PRINTEROPTION" cols="50" rows="15" Wrap="off">$defaultprinter</textarea></td></tr>
- </table>
- <br />
- <table width='10%' cellspacing='0'>
- <tr><td align='center'><input type='hidden' name='ACTION' value='smbprinteradd' />
- <input type='image' alt='$Lang::tr{'add share'}' title='$Lang::tr{'add share'}' src='/images/media-floppy.png' /></td></tr>
- </table>
- </form>
-END
-;
- }
-
-if ($sambasettings{'ACTION'} eq 'printerchange' || $sambasettings{'ACTION'} eq 'printercaption2' )
- {
- my $printeroption = $printer{$sambasettings{'NAME'}};
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'edit printer'}</b></td></tr>
- <tr><td colspan='2' align='center'></td></tr>
- <tr><td colspan='2' align='center'>$Lang::tr{'show share options'}<a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></td></tr>
- <tr><td colspan='2' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'><textarea name="PRINTEROPTION" cols="50" rows="15" Wrap="off">$printeroption</textarea></td></tr>
- </table>
- <br />
- <table width='10%' cellspacing='0'>
- <tr><td align='center'><input type='hidden' name='NAME' value='$sambasettings{'NAME'}' />
- <input type='image' alt='$Lang::tr{'change share'}' title='$Lang::tr{'change share'}' src='/images/media-floppy.png' />
- <input type='hidden' name='ACTION' value='smbprinterchange' /></form></td></tr>
- </table>
-END
-;
- }
-
-if ($sambasettings{'ACTION'} eq 'smbprinteradd')
- {
- $printer{'xvx'}= "$sambasettings{'PRINTEROPTION'}";
- save("printer");
- my %printer = config("${General::swroot}/samba/printer");
- }
-
-if ($sambasettings{'ACTION'} eq 'smbprinterdel')
- {
- delete $printer{$sambasettings{'NAME'}};
- save("printer");
- my %printer = config("${General::swroot}/samba/printer");
- }
-
-if ($sambasettings{'ACTION'} eq 'smbprinterchange')
- {
- $printer{$sambasettings{'NAME'}} = $sambasettings{'PRINTEROPTION'};
- save("printer");
- my %printer = config("${General::swroot}/samba/printer");
- }
-
-&Header::closebox();
-}
-
############################################################################################################################
############################################### Anzeige des Sambastatus ####################################################
-&Header::openbox('100%', 'center', 'Status');
-
-print <<END
-<br />
-<table width='95%' cellspacing='0'>
-<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'samba status'}</b></td></tr>
-<tr><td align='left'>$Status</td></tr>
-</table>
-END
-;
-&Header::closebox();
-
-############################################################################################################################
-############################################### Anzeige der Sambalogs ######################################################
-
-
-if ($sambasettings{'ACTION'} eq 'showlog')
-{
-$Log = qx(tail -n $sambasettings{'LOGLINES'} /var/log/samba/$sambasettings{'LOG'});
-$Log=~s/\n/<br \/>/g;
-}
+&Header::openbox('100%', 'left', $Lang::tr{'status'});
-&Header::openbox('100%', 'center', $Lang::tr{'log'});
+my $status = qx(/usr/local/bin/sambactrl smbstatus);
+$status = &Header::cleanhtml($status);
-print <<END
-<a name="$Lang::tr{'log view'}"></a>
-<br />
-<form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'log view'}'>
-<table width='95%' cellspacing='0'>
-<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'log view'}</b></td></tr>
-<tr><td colspan='3' align='left'><br /></td></tr>
-<tr><td align='left'><select name='LOG' style="width: 200px">
+print <<END;
+ <small>
+ <pre>$status</pre>
+ </small>
END
-;
-foreach my $log (@Logs) {chomp $log;print"<option value='$log'>$log</option>";}
-print <<END
-</select></td><td align='left'>$Lang::tr{'show last x lines'}<input type='text' name='LOGLINES' value='$LOGLINES' size="3" /></td>
- <td align='left'><input type='hidden' name='ACTION' value='showlog' /><input type='image' alt='view Log' title='view Log' src='/images/format-justify-fill.png' /></td></tr>
-<tr><td colspan='3' align='left'><br /></td></tr>
-<tr><td colspan='3' align='left'><font size=2>$Log</font></td></tr>
-<tr><td colspan='3' align='left'><br /></td></tr>
-<tr><td colspan='3' align='center'>$sambasettings{'LOG'}</td></tr>
-</table>
-</form>
-END
-;
&Header::closebox();
+
&Header::closebigbox();
&Header::closepage();
@@ -1301,27 +738,13 @@ my $smb = shift;
open (FILE, ">${General::swroot}/samba/$smb") or die "Can't $smb settings $!";
flock (FILE, 2);
-if ( $smb eq 'printer')
- {while (my ($name, $option) = each %printer){chomp $option;$option =~ s/\r\n/\n/gi;$option =~ s/^\n//gi;$option =~ s/^\r//gi;$option =~ s/^.\n//gi;$option =~ s/^.\r//gi;print FILE "$option\n";}}
-
if ( $smb eq 'shares')
{while (my ($name, $option) = each %shares){chomp $option;$option =~ s/\r\n/\n/gi;$option =~ s/^\n//gi;$option =~ s/^\r//gi;$option =~ s/^.\n//gi;$option =~ s/^.\r//gi;print FILE "$option\n";} }
close FILE;
-if ( -e "/var/ipfire/cups/enable")
- {
- if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");}
- else {system("/usr/local/bin/sambactrl smbsafeconfcups");}
- }
-else
- {
- if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");}
- else{system("/usr/local/bin/sambactrl smbsafeconf");}
- }
-
+system("/usr/local/bin/sambactrl smbsafeconf");
system("/usr/local/bin/sambactrl smbreload");
-refreshpage();
}
sub isrunning
@@ -1358,6 +781,69 @@ sub isrunning
return $status;
}
+sub writeconfiguration() {
+ open (FILE, ">${General::swroot}/samba/global") or die "Can't save the global settings: $!";
+ flock (FILE, 2);
+
+ print FILE <<END;
+# global.settings by IPFire Project
+
+[global]
+server string = Samba on IPFire
+
+workgroup = $sambasettings{'WORKGRP'}
+realm = $mainsettings{'DOMAINNAME'}
+passdb backend = smbpasswd
+
+map to guest = $sambasettings{'MAPTOGUEST'}
+
+guest account = $sambasettings{'GUESTACCOUNT'}
+unix password sync = no
+
+bind interfaces only = true
+interfaces = green0 blue0 127.0.0.0/8
+remote announce = $sambasettings{'REMOTEANNOUNCE'}
+remote browse sync = $sambasettings{'REMOTESYNC'}
+
+winbind separator = +
+winbind uid = 10000-20000
+winbind gid = 10000-20000
+winbind use default domain = yes
+
+# Log to syslog
+logging = syslog
+
+# Enable support for Apple
+vfs objects = catia fruit streams_xattr recycle
+
+# Enable following symlinks
+wide links = yes
+
+END
+
+# Server Role
+if ($sambasettings{'ROLE'} eq "standalone") {
+ print FILE "server role = standalone\n";
+} elsif ($sambasettings{'ROLE'} eq "member") {
+ print FILE "server role = member server\n";
+}
+
+if ($sambasettings{'ENCRYPTION'} =~ m/(desired|required)/) {
+ print FILE "smb encrypt = $1\n";
+}
+
+print FILE <<END;
+# Export all printers
+[printers]
+path = /var/spool/samba/
+printable = yes
+
+END
+close FILE;
+
+ system("/usr/local/bin/sambactrl smbsafeconf");
+}
+
sub joindomain {
my $username = shift;
my $password = shift;
diff --git a/html/cgi-bin/sambahlp.cgi b/html/cgi-bin/sambahlp.cgi
deleted file mode 100644
index 0ed099ab1..000000000
--- a/html/cgi-bin/sambahlp.cgi
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
-# #
-# 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 3 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, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-use strict;
-# enable only the following on debugging purpose
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-
-&Header::showhttpheaders();
-&Header::openpagewithoutmenu('Samba', 1, '');
-&Header::openbigbox('100%', 'left', '', 'BigBox');
-&Header::openbox('100%', 'left', '', 'Sambahelp');
-
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr><td><b>$Lang::tr{'caption'}</b></td></tr>
- <tr><td><u>$Lang::tr{'options'}</u></td><td><u>$Lang::tr{'meaning'}</u> / <u>$Lang::tr{'exampel'}</u></td></tr>
- <tr><td>comment</td><td>$Lang::tr{'comment'}</td></tr>
- <tr><td></td><td>comment = $Lang::tr{'my new share'}</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>path</td><td>$Lang::tr{'path to directory'}</td></tr>
- <tr><td></td><td>path = /tmp</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>writeable</td><td>$Lang::tr{'directory writeable'}</td></tr>
- <tr><td></td><td>writeable = yes</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>browseable</td><td>sichtbar in Verzeichnisliste</td></tr>
- <tr><td></td><td>browsable = yes</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>user</td><td>Besitzer der Freigabe</td></tr>
- <tr><td></td><td>user = samba</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>valid users</td><td>Liste der Zugriffsberechtigten</td></tr>
- <tr><td></td><td>valid users = samba, user1</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>write list</td><td>$Lang::tr{'visible in browselist'}</td></tr>
- <tr><td></td><td>write list = samba</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>hosts allow</td><td>$Lang::tr{'host allow'}</td></tr>
- <tr><td></td><td>hosts allow = localhost 192.168.1.1 192.168.2.0/24</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>hosts deny</td><td>$Lang::tr{'host deny'}</td></tr>
- <tr><td></td><td>hosts deny = 192.168.1.2 192.168.3.0/24</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>read list</td><td>$Lang::tr{'read list'}</td></tr>
- <tr><td></td><td>read list = user1</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>admin users</td><td>$Lang::tr{'admin users'}</td></tr>
- <tr><td></td><td>admin users = user1</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>invalid users</td><td>$Lang::tr{'invalid users'}</td></tr>
- <tr><td></td><td>invalid users = user2</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>force user</td><td>$Lang::tr{'force user'}</td></tr>
- <tr><td></td><td>force user = samba</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>directory mask</td><td>$Lang::tr{'directory mask'}</td></tr>
- <tr><td></td><td>directory mask = 0777</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>create mask</td><td>U$Lang::tr{'create mask'}</td></tr>
- <tr><td></td><td>create mask = 0777</td></tr>
- <tr><td><br /></td><td></td></tr>
- <tr><td>guest ok</td><td>$Lang::tr{'guest ok'}</td></tr>
- <tr><td></td><td>guest ok = yes</td></tr>
- </table>
-END
-;
-
-&Header::closebox();
-&Header::closebigbox();
-&Header::closepage();
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 27a24e9c9..0b4f098a7 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -756,6 +756,7 @@
'demon login script' => 'Demon login script',
'deprecated fs warn' => 'Deprecated filesystem! Newer kernel drop the support. Backup and reformat!',
'description' => 'Description',
+'desired' => 'Desired',
'dest ip and port' => 'Dest. IP: Port',
'destination' => 'Destination',
'destination ip' => 'Destination IP',
@@ -820,6 +821,7 @@
'dialup settings' => 'Dialup Settings',
'directory mask' => 'UNIX directory rights',
'directory writeable' => 'directory writeable',
+'disable' => 'Disable',
'disabled' => 'disabled',
'disconnect' => 'OVPN Stop / Disconnect',
'disconnected' => 'Disconnected',
@@ -988,6 +990,7 @@
'emerging rules' => 'Emergingthreats.net Community Rules',
'empty' => 'This field may be left blank',
'empty profile' => 'empty',
+'enable' => 'Enable',
'enable ignore filter' => 'Enable ignore filter',
'enable javascript' => 'Enable javascript',
'enable smt' => 'Enable Simultaneous Multi-Threading (SMT)',
@@ -1781,6 +1784,7 @@
'net traffic newversion' => 'New Net-Traffic version is available:',
'net-traffic configuration' => 'Net-Traffic Configuration',
'netbios name' => 'Netbios Name',
+'netbios nameserver daemon' => 'NetBIOS Nameserver Daemon',
'netmask' => 'Netmask',
'network' => 'Network',
'network added' => 'Custom network added',
@@ -1876,6 +1880,7 @@
'openvpn prefix remote subnet' => 'Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0.',
'openvpn server' => 'OpenVPN server',
'openvpn subnet is used' => 'The given subnet is used by another OpenVPN server.',
+'optional' => 'Optional',
'optional at cmd' => 'optional AT command',
'optional data' => '3. Optional Settings:',
'options' => 'Options',
@@ -2145,6 +2150,7 @@
'reportlevel' => 'Reportlevel',
'request' => 'Request',
'requested data' => '1. Connection Settings:',
+'required' => 'Required',
'required field' => 'Required field',
'reserved dst port' => 'Destination port is reserved for IPFire use only:',
'reserved src port' => 'Source port is reserved for IPFire use only:',
@@ -2177,6 +2183,8 @@
'samba' => 'Samba',
'samba join a domain' => 'Join a domain',
'samba join domain' => 'Join domain',
+'samba server role member' => 'Domain Member',
+'samba server role standalone' => 'Standalone',
'samba status' => 'Samba Status',
'saturday' => 'Saturday',
'save' => 'Save',
@@ -2252,6 +2260,7 @@
'smart information' => 'S.M.A.R.T. information',
'smartwarn1' => 'Device:',
'smartwarn2' => 'reports S.M.A.R.T. error',
+'smb daemon' => 'SMB Daemon',
'smbreload' => 'Reload samba',
'smbrestart' => 'Restart samba',
'smbstart' => 'Start samba',
@@ -2825,6 +2834,7 @@
'used swap' => 'Used Swap',
'user' => 'User',
'user log' => 'user log',
+'user management' => 'User Management',
'user proxy logs' => 'user proxy log',
'username' => 'Username:',
'username not set' => 'Username not set.',
@@ -2898,6 +2908,7 @@
'weekly firewallhits' => 'weekly firewallhits',
'weeks' => 'Weeks',
'wildcards' => 'Wildcards',
+'winbind daemon' => 'Winbind Daemon',
'wins server' => 'Wins Server',
'wins support' => 'Wins Support',
'wireless' => 'Wireless',
diff --git a/lfs/samba b/lfs/samba
index 874166d2e..15f9d10d2 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
-PAK_VER = 70
+PAK_VER = 71
DEPS = avahi cups libtirpc krb5 perl-Parse-Yapp
@@ -101,21 +101,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP)/source3 && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/
chown nobody:nobody -R /var/ipfire/samba/
- cp -vfp /var/ipfire/samba/default.global /var/ipfire/samba/global
- cp -vfp /var/ipfire/samba/default.pdc /var/ipfire/samba/pdc
- cp -vfp /var/ipfire/samba/default.settings /var/ipfire/samba/settings
- cp -vfp /var/ipfire/samba/default.shares /var/ipfire/samba/shares
- cp -vfp /var/ipfire/samba/default.printer /var/ipfire/samba/printer
cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf
rm -rf /var/lib/samba/private
ln -s /var/ipfire/samba/private /var/lib/samba/private
- -mkdir -p /var/log/samba
install -v -m 644 $(DIR_SRC)/config/backup/includes/samba /var/ipfire/backup/addons/includes/samba
-mkdir -p /var/lib/samba/winbindd_privileged
chmod 750 /var/lib/samba/winbindd_privileged
chgrp wbpriv /var/lib/samba/winbindd_privileged
+ # Create spool directory for print jobs
+ mkdir -p /var/spool/samba
+ chmod -v 1777 /var/spool/samba/
+
#install initscripts
$(call INSTALL_INITSCRIPT,samba)
diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c
index 45c166d46..91761a422 100644
--- a/src/misc-progs/sambactrl.c
+++ b/src/misc-progs/sambactrl.c
@@ -37,29 +37,9 @@ int main(int argc, char *argv[]) {
} else if (strcmp(argv[1], "smbsafeconf") == 0) {
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
- } else if (strcmp(argv[1], "smbsafeconfcups") == 0) {
- safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares /var/ipfire/samba/printer > /var/ipfire/samba/smb.conf");
-
} else if (strcmp(argv[1], "smbsafeconfpdc") == 0) {
safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/pdc /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
- } else if (strcmp(argv[1], "smbsafeconfpdccups") == 0) {
- safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/pdc /var/ipfire/samba/shares /var/ipfire/samba/printer > /var/ipfire/samba/smb.conf");
-
- } else if (strcmp(argv[1], "smbglobalreset") == 0) {
- safe_system("/bin/cat /var/ipfire/samba/default.global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
- safe_system("/bin/cat /var/ipfire/samba/default.settings > /var/ipfire/samba/settings");
- safe_system("/bin/cat /var/ipfire/samba/default.global > /var/ipfire/samba/global");
- safe_system("/bin/cat /var/ipfire/samba/default.pdc > /var/ipfire/samba/pdc");
-
- } else if (strcmp(argv[1], "smbsharesreset") == 0) {
- safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/default.shares > /var/ipfire/samba/smb.conf");
- safe_system("/bin/cat /var/ipfire/samba/default.shares > /var/ipfire/samba/shares");
-
- } else if (strcmp(argv[1], "smbprinterreset") == 0) {
- safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares /var/default.printer > /var/ipfire/samba/smb.conf");
- safe_system("/bin/cat /var/ipfire/samba/default.printer > /var/ipfire/samba/printer");
-
} else if (strcmp(argv[1], "smbstop") == 0) {
safe_system("/etc/rc.d/init.d/samba stop >/dev/null");
safe_system("/usr/local/bin/sambactrl disable");
@@ -91,16 +71,6 @@ int main(int argc, char *argv[]) {
snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s >/dev/null", argv[3], argv[3], argv[2]);
safe_system(command);
- } else if (strcmp(argv[1], "smbpcadd") == 0) {
- snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambawks >/dev/null");
- safe_system(command);
-
- snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba Workstation' -g %s -s %s %s >/dev/null", argv[3], argv[4], argv[2]);
- safe_system(command);
-
- snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -a -m %s >/dev/null", argv[2]);
- safe_system(command);
-
} else if (strcmp(argv[1], "smbchangepw") == 0) {
snprintf(command, BUFFER_SIZE-1, "echo %s:%s | chpasswd", argv[2], argv[3]);
safe_system(command);
diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh
index b7a2fc1cc..06a5b0358 100644
--- a/src/paks/samba/install.sh
+++ b/src/paks/samba/install.sh
@@ -32,4 +32,16 @@ fi
extract_files
restore_backup ${NAME}
+
+# Migrate SECURITY to ROLE
+sed -i /var/ipfire/samba/settings \
+ -e "s/^SECURITY=ADS/ROLE=member/" \
+ -e "s/^SECURITY=server/ROLE=standalone/" \
+ -e "s/^SECURITY=share/ROLE=standalone/" \
+ -e "s/^SECURITY=user/ROLE=standalone/"
+
+# Rewrite configuration files
+sudo -u nobody /srv/web/ipfire/cgi-bin/samba.cgi
+
+# Start the service
/usr/local/bin/sambactrl smbstart
diff --git a/src/paks/samba/update.sh b/src/paks/samba/update.sh
index 648b025b7..99776659c 100644
--- a/src/paks/samba/update.sh
+++ b/src/paks/samba/update.sh
@@ -17,21 +17,11 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+extract_backup_includes
./uninstall.sh
-
-# If the wbpriv group does not exist yet, then create it and put squid
-# into it.
-if ! getent group wbpriv >/dev/null; then
- groupadd -g 88 wbpriv
- usermod -a -G wbpriv squid
-fi
-
-extract_files
-restore_backup ${NAME}
-echo "passdb backend = smbpasswd" >> /var/ipfire/samba/smb.conf
-/usr/local/bin/sambactrl smbstart
+./install.sh
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, master, updated. c69c820025c21713cdb77eae3dd4fa61ca71b5fb
by Michael Tremer 14 Oct '20
by Michael Tremer 14 Oct '20
14 Oct '20
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, master has been updated
via c69c820025c21713cdb77eae3dd4fa61ca71b5fb (commit)
from 642557e23ba6c1bcab7e654569a35a5f4e6e8acc (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 c69c820025c21713cdb77eae3dd4fa61ca71b5fb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 14 11:32:05 2020 +0100
firewall: Filter only on RED and exclude any private address space
Since libloc is built as a tree we cannot simply exclude any address
space in the middle of it. Therefore we create some firewall rules
which simply avoid checking non-globally routable address space.
Fixes: #12499
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/firewall/rules.pl | 17 +++++++++++++++++
config/rootfiles/core/151/filelists/files | 1 +
2 files changed, 18 insertions(+)
Difference in files:
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index cad53a1d7..c2641a92d 100644
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -48,6 +48,13 @@ my @PROTOCOLS_WITH_PORTS = ("tcp", "udp");
my @VALID_TARGETS = ("ACCEPT", "DROP", "REJECT");
+my @PRIVATE_NETWORKS = (
+ "10.0.0.0/8",
+ "172.16.0.0/12",
+ "192.168.0.0/16",
+ "100.64.0.0/10",
+);
+
my %fwdfwsettings=();
my %fwoptions = ();
my %defaultNetworks=();
@@ -621,6 +628,16 @@ sub locationblock {
return;
}
+ # Only check the RED interface
+ if ($defaultNetworks{'RED_DEV'} ne "") {
+ run("$IPTABLES -A LOCATIONBLOCK ! -i $defaultNetworks{'RED_DEV'} -j RETURN");
+ }
+
+ # Do not check any private address space
+ foreach my $network (@PRIVATE_NETWORKS) {
+ run("$IPTABLES -A LOCATIONBLOCK -s $network -j RETURN");
+ }
+
# Loop through all supported locations and
# create iptables rules, if blocking for this country
# is enabled.
diff --git a/config/rootfiles/core/151/filelists/files b/config/rootfiles/core/151/filelists/files
index 8223d97de..9910e1bf9 100644
--- a/config/rootfiles/core/151/filelists/files
+++ b/config/rootfiles/core/151/filelists/files
@@ -10,6 +10,7 @@ srv/web/ipfire/cgi-bin/ipinfo.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/bin/probenic.sh
+usr/lib/firewall/rules.pl
usr/local/bin/ipsecctrl
var/ipfire/general-functions.pl
var/ipfire/langs
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 971f93ab126ffa64f54e7d684fd777c0adebaa97
by Michael Tremer 12 Oct '20
by Michael Tremer 12 Oct '20
12 Oct '20
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 971f93ab126ffa64f54e7d684fd777c0adebaa97 (commit)
via 642557e23ba6c1bcab7e654569a35a5f4e6e8acc (commit)
via e706f87eedf75f786530815fe149b2b8dca070c2 (commit)
via a836a2787c2f6ad50c3a3058b21fc961ef497406 (commit)
via decb7e61f19047ea6eb2dc1402efa46e581a8a0c (commit)
from 6522ab474f26751cd1cde863d68a1858a1d1141d (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 971f93ab126ffa64f54e7d684fd777c0adebaa97
Merge: 6522ab474 642557e23
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 12 20:21:09 2020 +0000
Merge remote-tracking branch 'origin/master' into next
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/oldcore/151/update.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Difference in files:
diff --git a/config/rootfiles/oldcore/151/update.sh b/config/rootfiles/oldcore/151/update.sh
index 699528274..5fb05488b 100644
--- a/config/rootfiles/oldcore/151/update.sh
+++ b/config/rootfiles/oldcore/151/update.sh
@@ -33,7 +33,9 @@ done
# Remove files
rm -rfv \
- /usr/lib/perl5/site_perl/5.30.0/Locale
+ /usr/lib/perl5/site_perl/5.30.0/Locale \
+ /usr/lib/perl5/site_perl/5.30.0/*/Net/DNS \
+ /usr/lib/perl5/site_perl/5.30.0/*/Net/DNS.pm
# Stop services
/etc/init.d/ipsec stop
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 642557e23ba6c1bcab7e654569a35a5f4e6e8acc
by Michael Tremer 12 Oct '20
by Michael Tremer 12 Oct '20
12 Oct '20
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, master has been updated
via 642557e23ba6c1bcab7e654569a35a5f4e6e8acc (commit)
via e706f87eedf75f786530815fe149b2b8dca070c2 (commit)
via a836a2787c2f6ad50c3a3058b21fc961ef497406 (commit)
via decb7e61f19047ea6eb2dc1402efa46e581a8a0c (commit)
from a9f69cbf01cd306dbc20c5761eedcdd97bc492e8 (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 642557e23ba6c1bcab7e654569a35a5f4e6e8acc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 12 10:15:59 2020 +0000
tor: Bump release
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e706f87eedf75f786530815fe149b2b8dca070c2
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Oct 9 19:20:32 2020 +0000
tor.cgi: fix calling Perl location module functions
The second version of this patch avoids re-defining $db_handle.
Fixes: #12492
Cc: Stefan Schantl <stefan.schantl(a)ipfire.org
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Acked-By: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a836a2787c2f6ad50c3a3058b21fc961ef497406
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 12 20:07:30 2020 +0000
core151: Remove multiple calls of rm
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit decb7e61f19047ea6eb2dc1402efa46e581a8a0c
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Mon Oct 12 20:28:31 2020 +0200
update.sh: Delete obsolete files from Net-DNS 1.25
Fixes Bug #12491
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/151/update.sh | 4 +++-
html/cgi-bin/tor.cgi | 5 ++---
lfs/tor | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/151/update.sh b/config/rootfiles/core/151/update.sh
index 699528274..5fb05488b 100644
--- a/config/rootfiles/core/151/update.sh
+++ b/config/rootfiles/core/151/update.sh
@@ -33,7 +33,9 @@ done
# Remove files
rm -rfv \
- /usr/lib/perl5/site_perl/5.30.0/Locale
+ /usr/lib/perl5/site_perl/5.30.0/Locale \
+ /usr/lib/perl5/site_perl/5.30.0/*/Net/DNS \
+ /usr/lib/perl5/site_perl/5.30.0/*/Net/DNS.pm
# Stop services
/etc/init.d/ipsec stop
diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 28dec6cf0..7447bd791 100644
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -322,14 +322,13 @@ END
<select name='TOR_EXIT_COUNTRY'>
<option value=''>- $Lang::tr{'tor exit country any'} -</option>
END
-
- my @country_codes = &Location::database_countries();
+ my @country_codes = &Location::database_countries($db_handle);
foreach my $country_code (@country_codes) {
# Convert country code into upper case format.
$country_code = uc($country_code);
# Get country name.
- my $country_name = &Location::Functions::get_country_name($country_code);
+ my $country_name = &Location::Functions::get_full_country_name($country_code);
print "<option value='$country_code'";
diff --git a/lfs/tor b/lfs/tor
index 322d706ce..7525445f5 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
-PAK_VER = 51
+PAK_VER = 52
DEPS = libseccomp
hooks/post-receive
--
IPFire 2.x development tree
1
0