From 20f478fd5e36bb03dd6850d3f5e8a2a459a6dc2b Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.com>
Date: Sun, 05 Apr 2015 21:32:59 -0400
Subject: [PATCH] Keep reject-sender-mismatch-setting also when updating Fixed missing parts for greylist, rbl in gentoo

---
 install/sql/ispconfig3.sql |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 0b5ce40..571d59d 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -184,6 +184,8 @@
   `limit_spamfilter_wblist` int(11) NOT NULL DEFAULT '0',
   `limit_spamfilter_user` int(11) NOT NULL DEFAULT '0',
   `limit_spamfilter_policy` int(11) NOT NULL DEFAULT '0',
+  `default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
+  `xmpp_servers` blob,
   `limit_xmpp_domain` int(11) NOT NULL DEFAULT '-1',
   `limit_xmpp_user` int(11) NOT NULL DEFAULT '-1',
   `limit_xmpp_muc` ENUM( 'n', 'y' ) NOT NULL default 'n',
@@ -995,7 +997,7 @@
   `sys_perm_group` varchar(5) DEFAULT NULL,
   `sys_perm_other` varchar(5) DEFAULT NULL,
   `server_id` int(11) NOT NULL DEFAULT '0',
-  `ip_address` varchar(15) DEFAULT NULL,
+  `ip_address` varchar(39) DEFAULT NULL,
   `vm_id` int(11) NOT NULL DEFAULT '0',
   `reserved` varchar(255) NOT NULL DEFAULT 'n',
   PRIMARY KEY (`ip_address_id`)
@@ -1977,7 +1979,7 @@
   `server_id` int(11) unsigned NOT NULL default '0',
   `domain` varchar(255) NOT NULL default '',
 
-  `auth_method` ENUM( 'isp', 'plain', 'hashed' ) NOT NULL default 'hashed',
+  `management_method` ENUM( 'normal', 'maildomain' ) NOT NULL default 'normal',
   `public_registration` ENUM( 'n', 'y' ) NOT NULL default 'n',
   `registration_url` varchar(255) NOT NULL DEFAULT '',
   `registration_message` varchar(255) NOT NULL DEFAULT '',
@@ -2002,6 +2004,18 @@
   `http_archive_show_status` enum('n', 'y') NOT NULL DEFAULT 'n',
   `use_status_host` enum('n','y') NOT NULL DEFAULT 'n',
 
+  `ssl_state` varchar(255) NULL,
+  `ssl_locality` varchar(255) NULL,
+  `ssl_organisation` varchar(255) NULL,
+  `ssl_organisation_unit` varchar(255) NULL,
+  `ssl_country` varchar(255) NULL,
+  `ssl_email` varchar(255) NULL,
+  `ssl_request` mediumtext NULL,
+  `ssl_cert` mediumtext NULL,
+  `ssl_bundle` mediumtext NULL,
+  `ssl_key` mediumtext NULL,
+  `ssl_action` varchar(16) NULL,
+
   `active` enum('n','y') NOT NULL DEFAULT 'n',
   PRIMARY KEY  (`domain_id`),
   KEY `server_id` (`server_id`,`domain`),
@@ -2022,12 +2036,8 @@
   `sys_perm_group` varchar(5) NOT NULL default '',
   `sys_perm_other` varchar(5) NOT NULL default '',
   `server_id` int(11) unsigned NOT NULL default '0',
-  `xmpp_domain_id` int(11) unsigned NOT NULL default '0',
-  `login` varchar(255) NOT NULL default '',
   `jid` varchar(255) NOT NULL default '',
   `password` varchar(255) NOT NULL default '',
-  `is_domain_admin` enum('n','y') NOT NULL default 'n',
-  `is_muc_admin` enum('n','y') NOT NULL default 'n',
   `active` enum('n','y') NOT NULL DEFAULT 'n',
   PRIMARY KEY  (`xmppuser_id`),
   KEY `server_id` (`server_id`,`jid`),

--
Gitblit v1.9.1