Disallow unknown referers by default

diff --git a/README b/README
index da2ca57..ca8225e 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Webmin Version 1.380
+Webmin Version 1.390
 --------------------
 Webmin is a web-based interface for system administration for Unix. 
 Using any browser that supports tables and forms, you can setup user

diff --git a/config-lib.pl b/config-lib.pl
index 4a78f8e..fa9de67 100644 (file)
--- a/config-lib.pl
+++ b/config-lib.pl
@@ -232,6 +232,7 @@ foreach $c (@info_order) {
                # Password free text
                $field = &ui_password($c, undef, $p[2] || 40, 0, $p[3]);
                }
+       $label = "<a name=$c>$label</a>";
        print &ui_table_row($label, $field, 1, [ "width=30% nowrap" ]);
        }
 }

diff --git a/config.cgi b/config.cgi
index 31193e5..635d13b 100755 (executable)
--- a/config.cgi
+++ b/config.cgi
@@ -6,7 +6,7 @@ require './web-lib.pl';
 require './config-lib.pl';
 require './ui-lib.pl';
 &init_config();
-$m = $ARGV[0];
+$m = $in{'module'} || $ARGV[0];
 &foreign_available($m) || &error($text{'config_eaccess'});
 %access = &get_module_acl(undef, $m);
 $access{'noconfig'} &&

diff --git a/lang/it b/lang/it
index 3bcf9fa..6310d75 100755 (executable)
--- a/lang/it
+++ b/lang/it
@@ -1,4 +1,4 @@
-acl_feedback=Può iniviare email di segnalazione?
+acl_feedback=Può inviare email di segnalazione?
 acl_feedback0=No
 acl_feedback1=Si, ma senza file di configurazione
 acl_feedback2=Si
@@ -226,7 +226,7 @@ session_mesg=Inserisci nome utente e password per il login al server Webmin su $
 session_mesg2=Inserisci nome utente e password per il login
 session_pass=Password
 session_save=Ricorda login permanentemente
-session_timed_out=Timeout di sessione dopo $1 minuti di inattività
+session_timed_out=La sessione è scaduta dopo $1 minuti di inattività
 session_user=Nome utente
 skill_high=Esperto
 skill_low=Inesperto

diff --git a/ldap-server/module.info b/ldap-server/module.info
index fe4cec8..a50994f 100644 (file)
--- a/ldap-server/module.info
+++ b/ldap-server/module.info
@@ -2,3 +2,4 @@ desc=LDAP Server
 longdesc=Manage the OpenLDAP server and objects in its database
 category=servers
 perldepends=Net::LDAP
+desc_ca=Servidor LDAP

diff --git a/makemodulerpm.pl b/makemodulerpm.pl
index 34e3733..035cbab 100755 (executable)
--- a/makemodulerpm.pl
+++ b/makemodulerpm.pl
@@ -64,6 +64,9 @@ while(@ARGV) {
        elsif ($a eq "--sign") {
                $sign = 1;
                }
+       elsif ($a eq "--epoch") {
+               $epoch = shift(@ARGV);
+               }
        elsif ($a =~ /^\-\-/) {
                print STDERR "Unknown option $a\n";
                exit(1);
@@ -90,6 +93,7 @@ if (!$dir) {
        print STDERR "                        [--provides provides]\n";
        print STDERR "                        [--usermin]\n";
        print STDERR "                        [--release number]\n";
+       print STDERR "                        [--epoch number]\n";
        print STDERR "                        [--target-dir directory]\n";
        print STDERR "                        [--dir directory-in-package]\n";
        print STDERR "                        [--allow-overwrite]\n";
@@ -209,6 +213,7 @@ $rdeps = join(" ", @rdeps, @extrareqs);
 $providesheader = $provides ? "Provides: $provides" : undef;
 $vendorheader = $vendor ? "Vendor: $vendor" : undef;
 $urlheader = $url ? "URL: $url" : undef;
+$epochheader = $epoch ? "Epoch: $epoch" : undef;
 open(SPEC, ">$spec_dir/$prefix$mod.spec");
 print SPEC <<EOF;
 %define __spec_install_post %{nil}
@@ -226,6 +231,7 @@ Source: $mod.tar.gz
 Vendor: Jamie Cameron
 BuildRoot: /tmp/%{name}-%{version}
 BuildArchitectures: noarch
+$epochheader
 $providesheader
 $vendorheader
 $urlheader

diff --git a/setup.sh b/setup.sh
index 4691c1e..ce069a3 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -653,6 +653,9 @@ if [ "$upgrading" != 1 ]; then
        if [ "$licence_module" != "" ]; then
                echo licence_module=$licence_module >>$cfile
        fi
+
+       # Disallow unknown referers by default
+       echo "referers_none=1" >>$cfile
 else
        # one-off hack to set log variable in config from miniserv.conf
        grep log= $config_dir/config >/dev/null
@@ -661,6 +664,12 @@ else
                grep logtime= $config_dir/miniserv.conf >> $config_dir/config
                grep logclear= $config_dir/miniserv.conf >> $config_dir/config
        fi
+
+       # Disallow unknown referers if not set
+       grep referers_none= $cfile >/dev/null
+       if [ "$?" != "0" ]; then
+               echo "referers_none=1" >>$cfile
+       fi
 fi
 echo $ver > $config_dir/version
 echo "..done"

diff --git a/version b/version
index ed46efe..a568589 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-1.380
+1.390