From a406154fb75816348c47b9444f0c5f6c7a4e5271 Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Tue, 16 Jun 2015 14:23:37 +0200 Subject: [PATCH] CNAME doesn't allow *anything* else --- install/upgrades/3.4.2.sql | 5 +++++ ssl/alternc-ssl.install.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 install/upgrades/3.4.2.sql diff --git a/install/upgrades/3.4.2.sql b/install/upgrades/3.4.2.sql new file mode 100644 index 00000000..613c02b7 --- /dev/null +++ b/install/upgrades/3.4.2.sql @@ -0,0 +1,5 @@ + + +UPDATE domaines_type SET compatibility='' where name='cname'; +UPDATE domaines_type SET compatibility=REPLACE(compatibility, 'cname,',''); + diff --git a/ssl/alternc-ssl.install.php b/ssl/alternc-ssl.install.php index 1b499ecf..9544c2d0 100644 --- a/ssl/alternc-ssl.install.php +++ b/ssl/alternc-ssl.install.php @@ -31,7 +31,7 @@ if ($argv[1] == "before-reload") { ('panel-ssl', 'HTTPS AlternC panel access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'txt,mx,mx2,defmx,defmx2', 'ALL', 0, 0, 1);"); $db->query("INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, enable, only_dns, need_dns, advanced ) VALUES - ('url-ssl', 'URL redirection, HTTP & HTTPS', 'URL', '%SUB% IN A @@PUBLIC_IP@@', 'cname,txt,mx,mx2,defmx,defmx2', 'ALL', 0, 0, 1);"); + ('url-ssl', 'URL redirection, HTTP & HTTPS', 'URL', '%SUB% IN A @@PUBLIC_IP@@', 'txt,mx,mx2,defmx,defmx2', 'ALL', 0, 0, 1);"); $db->query("SELECT * FROM domaines_type WHERE name='roundcube';"); if ($db->next_record()) {