Merge branch 'master' of github.com:webmin/webmin

.github/workflows/webmin.dev+webmin.yml

@@ -16,7 +16,6 @@ jobs:
       project-name: webmin
       is-release: ${{ github.event_name == 'release' }}
     secrets:
-      DEV_GPG_PH: ${{ secrets.DEV_GPG_PH }}
       DEV_IP_ADDR: ${{ secrets.DEV_IP_ADDR }}
       DEV_IP_KNOWN_HOSTS: ${{ secrets.DEV_IP_KNOWN_HOSTS }}
       DEV_UPLOAD_SSH_USER: ${{ secrets.DEV_UPLOAD_SSH_USER }}

bind8/bind8-lib.pl

@@ -3121,11 +3121,11 @@ $slave_error = $_[0];
 
 sub get_forward_record_types
 {
-return ("A", "NS", "CNAME",
+return ("A", $config{'support_aaaa'} ? ( "AAAA" ) : ( ), "NS", "CNAME",
 	$config{'allow_alias'} ? ( "ALIAS" ) : ( ),
 	"MX", "HINFO", "TXT", "SPF", "DMARC", "WKS", "RP", "PTR", "LOC",
 	"SRV", "KEY", "TLSA", "SSHFP", "CAA", "NAPTR", "NSEC3PARAM",
-	$config{'support_aaaa'} ? ( "AAAA" ) : ( ), @extra_forward);
+	 @extra_forward);
 }
 
 sub get_reverse_record_types

bind8/lang/en

@@ -262,7 +262,7 @@ edit_upfwd=Update forward?
 edit_err=Failed to save record
 edit_egone=Selected record no longer exists!
 edit_ettl='$1' is not a valid time-to-live
-edit_eip='$1' is not a valid IP address
+edit_eip='$1' is not a valid IP4 address
 edit_eip6='$1' is not a valid IPv6 address
 edit_ehost='$1' is not a valid hostname
 edit_eserv2='$1' is not a valid service name
@@ -309,8 +309,8 @@ edit_espfa='$1' is not a valid host to allow sending from
 edit_espfa2='$1' must be a hostname, not an IP address
 edit_espfmx='$1' is not a valid domain name to allow MX sending from
 edit_espfmxmax=You are not allowed to have more than 10 domains to allow MX sending from
-edit_espfip='$1' is not a valid IP address or IP/prefix to allow sending from
-edit_espfip6='$1' is not a valid IPv6 address or IPv6/prefix to allow sending from
+edit_espfip='$1' is not a valid IPv4 address or IPv4 prefix to allow sending from
+edit_espfip6='$1' is not a valid IPv6 address or IPv6 prefix to allow sending from
 edit_espfinclude='$1' is not a valid additional domain from which mail is sent
 edit_espfredirect='$1' is not a valid alternate domain name
 edit_espfexp='$1' is a valid record name for a rejection message
@@ -394,7 +394,7 @@ boot_err=Download failed
 boot_egzip=The root zone file is compressed, but the <tt>gzip</tt> command is not installed on your system!
 boot_egzip2=Uncompression of root zone file failed : $1
 
-type_A=Address
+type_A=IPv4 Address
 type_AAAA=IPv6 Address
 type_NS=Name Server
 type_CNAME=Name Alias
@@ -417,7 +417,7 @@ type_KEY=Public Key
 type_CAA=Certificate Authority
 type_NAPTR=Name Authority Pointer
 
-edit_A=Address
+edit_A=IPv4 Address
 edit_AAAA=IPv6 Address
 edit_NS=Name Server
 edit_CNAME=Name Alias
@@ -440,7 +440,7 @@ edit_CAA=Certificate Authority
 edit_NAPTR=Name Authority Pointer
 
 recs_defttl=Default TTL
-recs_A=Address
+recs_A=IPv4 Address
 recs_AAAA=IPv6 Address
 recs_NS=Name Server
 recs_CNAME=Name Alias
@@ -464,7 +464,7 @@ recs_CAA=Certificate Authority
 recs_NAPTR=Name Authority
 recs_delete=Delete Selected
 
-value_A1=Address
+value_A1=IPv4 Address
 value_AAAA1=IPv6 Address
 value_NS1=Name Server
 value_CNAME1=Real Name
@@ -511,7 +511,7 @@ value_spfmx=Allow sending from domain's MX hosts?
 value_spfptr=Allow sending from any host in domain?
 value_spfas=Additional allowed sender hosts
 value_spfmxs=Additional allowed sender MX domains
-value_spfip4s=Additional allowed sender IP addresses/networks
+value_spfip4s=Additional allowed sender IPv4 addresses/networks
 value_spfip6s=Additional allowed sender IPv6 addresses/networks
 value_spfincludes=Other domains from which mail is sent
 value_spfall=Action for other senders

webmin/os-eol-lib.pl

@@ -103,11 +103,19 @@ if (ref($eol_json) eq 'ARRAY' && @$eol_json) {
         return undef if (!$eol_json_this_os);
         $eol_json_this_os->{'_os_name'} = $gconfig{'real_os_type'};
         $eol_json_this_os->{'_os_version'} = $os_version;
+        # If the OS is still in development and EOL date is not set
+        if (!$eol_json_this_os->{'eol'} ||
+            $eol_json_this_os->{'eol'} eq '0000-00-00' ||
+            $eol_json_this_os->{'eol'} !~ /\d{4}-\d{2}-\d{2}/) {
+                return undef;
+                }
         # Convert EOL date to a timestamp
         my ($year, $month, $day) = split('-', $eol_json_this_os->{'eol'});
         $eol_json_this_os->{'_eol_timestamp'} = timelocal(0, 0, 0, $day, $month - 1, $year);
-        # Convert EOL extendend date to a timestamp
-        if ($eol_json_this_os->{'extendedSupport'}) {
+        # Convert EOL extended date to a timestamp
+        if ($eol_json_this_os->{'extendedSupport'} &&
+            $eol_json_this_os->{'extendedSupport'} ne '0000-00-00' &&
+            $eol_json_this_os->{'extendedSupport'} =~ /\d{4}-\d{2}-\d{2}/) {
                 my ($year, $month, $day) = split('-', $eol_json_this_os->{'extendedSupport'});
                 $eol_json_this_os->{'_ext_eol_timestamp'} =
                         timelocal(0, 0, 0, $day, $month - 1, $year);
@@ -123,6 +131,7 @@ return undef;
 sub eol_populate_dates
 {
 my ($eol_data) = @_;
+return undef unless ref $eol_data;
 if (!$eol_data->{'_eol_timestamp'}) {
         &error_stderr("The provided data is not a valid EOL data hash reference");
         return undef;