Commit Diff


commit - cb0c422ebbc2e9ec06d17ad3ef30447eba2f2cc8
commit + 05eea069af9b0781e17ebb6d5513082a1af101ed
blob - 21c279fc52c090fd5b0bedbdfe31d05ac6a2787c
blob + 1f2c86f315abe0b0994b5110c8675c3ffb3bf5d4
--- README.md
+++ README.md
@@ -12,7 +12,6 @@ Database needed to use SQL with OpenSMTPD
 	  `password` varchar(255) NOT NULL DEFAULT '',
 	  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	  `active` tinyint(1) NOT NULL DEFAULT 1
 	) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='OpenSMTPD Admin - Virtual Admins';
 
 	CREATE TABLE `alias` (
@@ -21,7 +20,6 @@ Database needed to use SQL with OpenSMTPD
 	  `domain` varchar(255) NOT NULL DEFAULT '',
 	  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	  `active` tinyint(1) NOT NULL DEFAULT 1
 	) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='OpenSMTPD Admin - Virtual Aliases';
 
 	CREATE TABLE `domain` (
@@ -29,19 +27,14 @@ Database needed to use SQL with OpenSMTPD
 	  `description` varchar(255) NOT NULL DEFAULT '',
 	  `aliases` int(10) NOT NULL DEFAULT 0,
 	  `mailboxes` int(10) NOT NULL DEFAULT 0,
-	  `maxquota` int(10) NOT NULL DEFAULT 0,
-	  `transport` varchar(255) DEFAULT NULL,
-	  `backupmx` tinyint(1) NOT NULL DEFAULT 0,
 	  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	  `active` tinyint(1) NOT NULL DEFAULT 1
 	) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='OpenSMTPD Admin - Virtual Domains';
 
 	CREATE TABLE `domain_admins` (
 	  `username` varchar(255) NOT NULL DEFAULT '',
 	  `domain` varchar(255) NOT NULL DEFAULT '',
 	  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	  `active` tinyint(1) NOT NULL DEFAULT 1
 	) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='OpenSMTPD Admin - Domain Admins';
 
 	CREATE TABLE `log` (
@@ -71,6 +64,6 @@ Connecting the database to smtpd:
 	database        opensmtpd
 
 	query_alias             SELECT goto FROM alias WHERE address=?;
-	query_credentials       SELECT username, password FROM mailbox WHERE username=? AND active='1';
-	query_domain            SELECT domain FROM domain WHERE domain=? AND active='1';
-	query_userinfo          SELECT 501, 501, maildir FROM mailbox WHERE username=? AND active='1';
+	query_credentials       SELECT username, password FROM mailbox WHERE username=?;
+	query_domain            SELECT domain FROM domain WHERE domain=?;
+	query_userinfo          SELECT 501, 501, maildir FROM mailbox WHERE username=?;