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

[David Woodhouse (dwmw2)]

Author: dwmw2

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

Modified Files:
	exim-greylist.conf.inc mk-greylist-db.sql 
Log Message:
fix sql, remove bogus success/failure indication


Index: exim-greylist.conf.inc
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/exim-greylist.conf.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- exim-greylist.conf.inc	7 Feb 2007 12:32:44 -0000	1.3
+++ exim-greylist.conf.inc	7 Feb 2007 12:45:33 -0000	1.4
@@ -67,18 +67,15 @@
 
   # If the mail isn't already the database, defer it with an appropriate 
   # message, and add it. Do the addition to the greylist database as a 
-  # hackish side-effect of the log-message, appending 'success' or 'failure'
-  # to the log-message depending on whether the SQL worked (which it always
-  # should). This is where the 5 minute timeout is set ($tod_epoch + 300)
-  # should you wish to change it.
+  # hackish side-effect of the log-message. This is where the 5 minute
+  # timeout is set ($tod_epoch + 300), should you wish to change it.
   defer condition = ${if eq {$acl_m_greyexpiry}{} {1}}
-	log_message = Greylisted $h_message-id: for offences: ${sg {$acl_m_greylistreasons}{\n}{,}}:\
+	log_message = Greylisted $h_message-id: for offences: ${sg {$acl_m_greylistreasons}{\n}{,}}\
 		${lookup sqlite {GREYDB INSERT INTO greylist \
 					VALUES ( '$acl_m_greyident', \
 						 '${eval10:$tod_epoch+300}', \
 						 '$sender_host_address', \
-						 '${quote_sqlite:$sender_helo_name}' );}\
-			{success}{failure}}
+						 '${quote_sqlite:$sender_helo_name}' );}}
         message = Your mail was considered suspicious for the following reason(s):\n$acl_m_greylistreasons \
 		  The mail has been greylisted for 5 minutes, after which it should be accepted. \
 		  We apologise for the inconvenience. Your mail system should keep the mail on \


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