rpms/exim/devel exim-greylist.conf.inc, 1.2, 1.3 mk-greylist-db.sql, 1.1, 1.2

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/extras/rpms/exim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23332

Modified Files:
	exim-greylist.conf.inc mk-greylist-db.sql 
Log Message:
primary key in resenders is (host,helo) not just host


Index: exim-greylist.conf.inc
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/exim-greylist.conf.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- exim-greylist.conf.inc	7 Feb 2007 12:21:10 -0000	1.2
+++ exim-greylist.conf.inc	7 Feb 2007 12:32:44 -0000	1.3
@@ -19,10 +19,10 @@
 # database table for these 'known resenders' looks like this:
 #
 # CREATE TABLE resenders (
-#        host            TEXT PRIMARY KEY,
+#        host            TEXT,
 #        helo            TEXT,
-#        time            INTEGER
-# );
+#        time            INTEGER,
+#    PRIMARY KEY (host, helo) );
 #
 # To remember mail we've rejected, we create an 'identity' from its sender
 # and recipient addresses and its Message-ID: header. We don't include the
@@ -37,11 +37,10 @@
 # looks like this:
 #
 # CREATE TABLE greylist (
-#        id              TEXT PRIMARY KEY,
+#        id              TEXT,
 #        expire          INTEGER,
 #        host            TEXT,
-#        helo            TEXT
-# );
+#        helo            TEXT);
 #
 
 greylist_mail:


Index: mk-greylist-db.sql
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/mk-greylist-db.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mk-greylist-db.sql	7 Feb 2007 12:18:24 -0000	1.1
+++ mk-greylist-db.sql	7 Feb 2007 12:32:44 -0000	1.2
@@ -1,7 +1,8 @@
 CREATE TABLE resenders (
-	host		TEXT PRIMARY KEY,
+	host		TEXT,
 	helo		TEXT,
 	time		INTEGER
+    PRIMARY KEY (host, helo)
 );
 
 CREATE TABLE greylist (