[git.ipfire.org] IPFire 2.x development tree branch, next, updated. eaa9032166dcf1be88b6987419f23b617aa4a627

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. eaa9032166dcf1be88b6987419f23b617aa4a627

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 3062 bytes --]

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  eaa9032166dcf1be88b6987419f23b617aa4a627 (commit)
       via  00e1105b9294b13570b931c6212f13da8a753581 (commit)
      from  a99b73211a06c00e6dd36324a33120da7320c6a4 (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 eaa9032166dcf1be88b6987419f23b617aa4a627
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Dec 8 17:40:57 2020 +0000

    core153: add ddns.cgi to update
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 00e1105b9294b13570b931c6212f13da8a753581
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed Dec 2 12:30:11 2020 +0100

    ddns.cgi: Drop static provider list for token based auth.
    
    This is really hard to maintain when adding new or altering existing
    providers.
    
    Reference #12415.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/153/filelists/files | 1 +
 html/cgi-bin/ddns.cgi                     | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/core/153/filelists/files
index 0649f85cb..f77958ae6 100644
--- a/config/rootfiles/core/153/filelists/files
+++ b/config/rootfiles/core/153/filelists/files
@@ -10,6 +10,7 @@ srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/country.cgi
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/dns.cgi
+srv/web/ipfire/cgi-bin/ddns.cgi
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ipinfo.cgi
 srv/web/ipfire/cgi-bin/location-block.cgi
diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi
index 715c37290..024eaf7f6 100644
--- a/html/cgi-bin/ddns.cgi
+++ b/html/cgi-bin/ddns.cgi
@@ -665,13 +665,13 @@ sub GenerateDDNSConfigFile {
 
 		my $use_token = 0;
 
-		# Handle token based auth for various providers.
-		if ($provider ~~ ["dns.lightningwirelabs.com", "entrydns.net", "regfish.com",
-				  "spdns.de", "zzzz.io"] && $username eq "token") {
+		# Check if token based auth is configured.
+		if ($username eq "token") {
 			$use_token = 1;
+		}
 
 		# Handle token auth for freedns.afraid.org and regfish.com.
-		} elsif ($provider ~~ ["freedns.afraid.org", "regfish.com"] && $password eq "") {
+		if ($provider ~~ ["freedns.afraid.org", "regfish.com"] && $password eq "") {
 			$use_token = 1;
 			$password = $username;
 


hooks/post-receive
--
IPFire 2.x development tree