From cedad166fa7655b0a49e7e27c57bbee78032fbe7 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 24 Sep 2015 07:47:39 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/sql/ispconfig3.sql | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index df45246..6089f3f 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -785,6 +785,7 @@
`destination` text,
`type` enum('alias','aliasdomain','forward','catchall') NOT NULL default 'alias',
`active` enum('n','y') NOT NULL DEFAULT 'n',
+ `greylisting` enum('n','y' ) NOT NULL DEFAULT 'n',
PRIMARY KEY (`forwarding_id`),
KEY `server_id` (`server_id`,`source`),
KEY `type` (`type`)
@@ -928,6 +929,7 @@
`move_junk` enum('n','y') NOT NULL default 'n',
`custom_mailfilter` mediumtext,
`postfix` enum('n','y') NOT NULL default 'y',
+ `greylisting` enum('n','y' ) NOT NULL DEFAULT 'n',
`access` enum('n','y') NOT NULL default 'y',
`disableimap` enum('n','y') NOT NULL default 'n',
`disablepop3` enum('n','y') NOT NULL default 'n',
@@ -1002,6 +1004,7 @@
`ip_address` varchar(39) DEFAULT NULL,
`vm_id` int(11) NOT NULL DEFAULT '0',
`reserved` varchar(255) NOT NULL DEFAULT 'n',
+ `additional` varchar(255) NOT NULL DEFAULT 'n',
PRIMARY KEY (`ip_address_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
--
Gitblit v1.9.1