From 34d684aa34e5225f12a62dce183e2bb35cd05958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?A=2E=20T=C3=A4ffner?= <darkalex@firesplash.de>
Date: Mon, 25 Jan 2016 16:44:59 +0100
Subject: [PATCH] wrong RFC... my bad... never happened :)

---
 install/sql/incremental/upd_dev_collection.sql | 2 +-
 install/sql/ispconfig3.sql                     | 2 +-
 interface/web/dns/form/dns_spf.tform.php       | 2 +-
 server/conf/bind_pri.domain.master             | 4 ----
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 030209ecfd..32e85bd876 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -206,7 +206,7 @@ UPDATE `mail_forwarding` SET `allow_send_as` = 'y' WHERE `type` = 'alias';
 
 --- DNSSEC-Implementation by dark alex
 --- TODO: Review and resolve conflicts if more has been done in that column
-ALTER TABLE `dns_rr` CHANGE COLUMN `type` `type` ENUM('A','AAAA','ALIAS','CNAME','DS','HINFO','LOC','MX','NAPTR','NS','PTR','RP','SPF','SRV','TXT','TLSA','DNSKEY') NULL DEFAULT NULL AFTER `name`;
+ALTER TABLE `dns_rr` CHANGE COLUMN `type` `type` ENUM('A','AAAA','ALIAS','CNAME','DS','HINFO','LOC','MX','NAPTR','NS','PTR','RP','SRV','TXT','TLSA','DNSKEY') NULL DEFAULT NULL AFTER `name`;
 
 ALTER TABLE `dns_soa`
 	ADD COLUMN `dnssec_initialized` ENUM('Y','N') NOT NULL DEFAULT 'N',
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 50ef3938be..fedb106bd3 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -478,7 +478,7 @@ CREATE TABLE `dns_rr` (
   `server_id` int(11) NOT NULL default '1',
   `zone` int(11) unsigned NOT NULL DEFAULT '0',
   `name` varchar(255) NOT NULL DEFAULT '',
-  `type` enum('A','AAAA','ALIAS','CNAME','DS','HINFO','LOC','MX','NAPTR','NS','PTR','RP','SPF','SRV','TXT','TLSA','DNSKEY') default NULL,
+  `type` enum('A','AAAA','ALIAS','CNAME','DS','HINFO','LOC','MX','NAPTR','NS','PTR','RP','SRV','TXT','TLSA','DNSKEY') default NULL,
   `data` TEXT NOT NULL DEFAULT '',
   `aux` int(11) unsigned NOT NULL default '0',
   `ttl` int(11) unsigned NOT NULL default '3600',
diff --git a/interface/web/dns/form/dns_spf.tform.php b/interface/web/dns/form/dns_spf.tform.php
index 1d43e680b6..ea2cf8310c 100644
--- a/interface/web/dns/form/dns_spf.tform.php
+++ b/interface/web/dns/form/dns_spf.tform.php
@@ -97,7 +97,7 @@ $form["tabs"]['dns'] = array (
 		'type' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
-			'default' => 'SPF',
+			'default' => 'TXT',
 			'value'  => '',
 			'width'  => '5',
 			'maxlength' => '5'
diff --git a/server/conf/bind_pri.domain.master b/server/conf/bind_pri.domain.master
index 7c8a8b4aac..ed395064af 100644
--- a/server/conf/bind_pri.domain.master
+++ b/server/conf/bind_pri.domain.master
@@ -44,10 +44,6 @@ $TTL        {tmpl_var name='ttl'}
 <tmpl_if name="type" op='==' value='RP'>
 {tmpl_var name='name'} {tmpl_var name='ttl'}      RP        {tmpl_var name='data'}
 </tmpl_if>
-<tmpl_if name="type" op='==' value='SPF'>
-{tmpl_var name='name'} {tmpl_var name='ttl'}      TXT       "{tmpl_var name='data'}"
-{tmpl_var name='name'} {tmpl_var name='ttl'}      SPF       "{tmpl_var name='data'}"
-</tmpl_if>
 <tmpl_if name="type" op='==' value='SRV'>
 {tmpl_var name='name'} {tmpl_var name='ttl'}      SRV        {tmpl_var name='aux'} {tmpl_var name='data'}
 </tmpl_if>
-- 
GitLab