--- ../local_scan.c	Sun Mar 20 13:43:56 2005
+++ local_scan.c	Sun Mar 20 13:37:58 2005
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "env.h"
 #include "/usr/include/mysql/mysql.h"
 
 /************************/
@@ -223,7 +224,7 @@
  MYSQL *mysql = NULL;
  int i,  ret = LOCAL_SCAN_ACCEPT;
 
-
+char *relayclient;
 
 #ifdef DBGSCAN
  dbglog = fopen("/tmp/greylist_dbg.txt","a");
@@ -234,7 +235,9 @@
  fd = fd;                      /* Keep picky compilers happy */
  return_text = return_text;                     /* Keep picky compilers happy */
  mysql = mysql_init(NULL);
- if (mysql && strcmp(received_protocol,"local") ) {
+ relayclient = env_get("RELAYCLIENT");
+ if(!relayclient) {
+  if (mysql && strcmp(received_protocol,"local") ) {
    if (mysql_real_connect(mysql,MYSQLHOST,MYSQLUSER,MYSQLPASS,MYSQLDB,0,NULL,0)) {
      if ( !checkWhiteListIP( mysql, &ret )) {      /* check for whitelisted sender ip address */
        for(i= 0 ; i <  recipients_count; i++ ) {
@@ -246,6 +249,7 @@
        }
      }
    }
+  }
  }
  if(mysql) mysql_close(mysql);
  if(dbglog) {
--- ../Makefile	Sun Mar 20 13:39:37 2005
+++ Makefile	Sun Mar 20 13:21:02 2005
@@ -1679,8 +1679,8 @@
 	socket.lib tai.lib dns.lib` dns.o lock.a $(VPOPMAIL_LIBS)
 
 qmail-envelope-scanner: \
-load qmail-envelope-scanner.o local_scan.o /usr/lib/libmysqlclient.a
-	./load qmail-envelope-scanner -lz -lm local_scan.o /usr/lib/libmysqlclient.a
+load qmail-envelope-scanner.o local_scan.o env.a str.a /usr/lib/libmysqlclient.a
+	./load qmail-envelope-scanner -lz -lm local_scan.o env.a str.a /usr/lib/libmysqlclient.a
 
 qmail-envelope-scanner.o: \
 compile qmail-envelope-scanner.c local_scan.h