[git.ipfire.org] IPFire 2.x development tree branch, core89, updated. 810fb1046c1253c74ff41527509dc1c46b0f4426

[git.ipfire.org] IPFire 2.x development tree branch, core89, updated. 810fb1046c1253c74ff41527509dc1c46b0f4426

[git]

[-- Attachment #1: Type: text/plain, Size: 2426 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, core89 has been updated
       via  810fb1046c1253c74ff41527509dc1c46b0f4426 (commit)
       via  0ffeaa13a64b3dc4eabe404bfac8b3767616e268 (commit)
      from  78a620c82b6c179e60f484599de82b6adfbf900a (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 810fb1046c1253c74ff41527509dc1c46b0f4426
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Fri Mar 20 18:53:44 2015 +0100

    ddns.cgi: Drop code for proto handling.

commit 0ffeaa13a64b3dc4eabe404bfac8b3767616e268
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Mar 20 19:04:33 2015 +0100

    Revert "dnsmasq: Enable DNSSEC timestamp feature"
    
    This reverts commit de7abd2cd52e3751ac94d5d56ae9ff510311fc67.

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

Summary of changes:
 html/cgi-bin/ddns.cgi          | 5 -----
 src/initscripts/init.d/dnsmasq | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi
index 044aa97..3e6f72f 100644
--- a/html/cgi-bin/ddns.cgi
+++ b/html/cgi-bin/ddns.cgi
@@ -700,11 +700,6 @@ sub GenerateDDNSConfigFile {
 			print FILE "password = $password\n";
 		}
 
-		# These providers need to be set to only use IPv4.
-		if ($provider ~~ ["freedns.afraid.org", "nsupdate.info", "opendns.com", "variomedia.de", "zoneedit.com"]) {
-			print FILE "proto = ipv4\n";
-		}
-
 		print FILE "\n";
 	}
 
diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index 4e37925..48b9d19 100644
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -26,7 +26,7 @@ SHOW_SRV=1
 TRUST_ANCHOR=".,19036,8,2,49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5"
 
 function dnssec_args() {
-	local cmdline="--dnssec --dnssec-timestamp"
+	local cmdline="--dnssec"
 
 	if [ -n "${TRUST_ANCHOR}" ]; then
 		cmdline="${cmdline} --trust-anchor=${TRUST_ANCHOR}"


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