From 2cbff3b553d2e65ef67797b85176e3d87c8a97ce Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 14 Jan 2010 10:02:28 -0500
Subject: [PATCH] Fixed: FS#1007 - add a stricter check for getmail domains names.
---
install/sql/ispconfig3.sql | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 0b20115..892a40a 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -297,12 +297,12 @@
`parent_domain_id` int(11) unsigned NOT NULL default '0',
`username` varchar(64) default NULL,
`password` varchar(64) default NULL,
- `quota_size` int(11) NOT NULL default '-1',
+ `quota_size` bigint(20) NOT NULL default '-1',
`active` enum('n','y') NOT NULL default 'y',
`uid` varchar(64) default NULL,
`gid` varchar(64) default NULL,
`dir` varchar(255) default NULL,
- `quota_files` int(11) NOT NULL default '-1',
+ `quota_files` bigint(20) NOT NULL default '-1',
`ul_ratio` int(11) NOT NULL default '-1',
`dl_ratio` int(11) NOT NULL default '-1',
`ul_bandwidth` int(11) NOT NULL default '-1',
@@ -398,7 +398,8 @@
`type` enum('alias','aliasdomain','forward','catchall') NOT NULL default 'alias',
`active` enum('n','y') NOT NULL,
PRIMARY KEY (`forwarding_id`),
- KEY `server_id` (`server_id`,`source`)
+ KEY `server_id` (`server_id`,`source`),
+ KEY `type` (`type`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
@@ -459,6 +460,26 @@
PRIMARY KEY (`mailman_id`,`server_id`,`domain`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
+-- --------------------------------------------------------
+
+--
+-- Table structure for Table `mail_relay_recipient`
+--
+
+CREATE TABLE IF NOT EXISTS `mail_relay_recipient` (
+ `relay_recipient_id` bigint(20) NOT NULL AUTO_INCREMENT,
+ `sys_userid` int(11) NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) DEFAULT NULL,
+ `sys_perm_group` varchar(5) DEFAULT NULL,
+ `sys_perm_other` varchar(5) DEFAULT NULL,
+ `server_id` int(11) NOT NULL DEFAULT '0',
+ `source` varchar(255) DEFAULT NULL,
+ `access` varchar(255) NOT NULL DEFAULT 'OK',
+ `active` varchar(255) NOT NULL DEFAULT 'y',
+ PRIMARY KEY (`relay_recipient_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+
-- --------------------------------------------------------
@@ -518,16 +539,20 @@
`uid` int(11) unsigned NOT NULL default '5000',
`gid` int(11) unsigned NOT NULL default '5000',
`maildir` varchar(255) NOT NULL default '',
- `quota` int(11) NOT NULL default '-1',
+ `quota` bigint(20) NOT NULL default '-1',
`homedir` varchar(255) NOT NULL,
`autoresponder` enum('n','y') NOT NULL default 'n',
+ `autoresponder_start_date` datetime NOT NULL default '0000-00-00 00:00:00',
+ `autoresponder_end_date` datetime NOT NULL default '0000-00-00 00:00:00',
`autoresponder_text` mediumtext NULL,
`move_junk` enum('n','y') NOT NULL default 'n',
`custom_mailfilter` mediumtext,
`postfix` enum('n','y') NOT NULL,
`access` enum('n','y') NOT NULL,
- `disableimap` enum('0','1') NOT NULL default '0',
- `disablepop3` enum('0','1') NOT NULL default '0',
+ `disableimap` enum('n','y') NOT NULL default 'n',
+ `disablepop3` enum('n','y') NOT NULL default 'n',
+ `disabledeliver` enum('n','y') NOT NULL default 'n',
+ `disablesmtp` enum('n','y') NOT NULL default 'n',
PRIMARY KEY (`mailuser_id`),
KEY `server_id` (`server_id`,`email`),
KEY `email_access` (`email`,`access`)
@@ -649,7 +674,7 @@
`parent_domain_id` int(11) unsigned NOT NULL default '0',
`username` varchar(64) default NULL,
`password` varchar(64) default NULL,
- `quota_size` int(11) NOT NULL default '-1',
+ `quota_size` bigint(20) NOT NULL default '-1',
`active` enum('n','y') NOT NULL default 'y',
`puser` varchar(255) default NULL,
`pgroup` varchar(255) default NULL,
@@ -1009,8 +1034,8 @@
`document_root` varchar(255) default NULL,
`system_user` varchar(255) default NULL,
`system_group` varchar(255) default NULL,
- `hd_quota` int(11) NOT NULL default '0',
- `traffic_quota` int(11) NOT NULL default '0',
+ `hd_quota` bigint(20) NOT NULL default '0',
+ `traffic_quota` bigint(20) NOT NULL default '0',
`cgi` enum('n','y') NOT NULL default 'y',
`ssi` enum('n','y') NOT NULL default 'y',
`suexec` enum('n','y') NOT NULL default 'y',
--
Gitblit v1.9.1