From 1f50209744f36c1602b11a3787dacfd3ea76527e Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 20 Jul 2015 04:23:33 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/sql/ispconfig3.sql | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index df45246..1ed6e5e 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',
--
Gitblit v1.9.1