1 files changed, 28 insertions, 15 deletions

diff --git a/tools/ltgrey.c b/tools/ltgrey.c
index afdb4c1..c9f384f 100644
--- a/tools/ltgrey.c
+++ b/tools/ltgrey.c
@@ -14,17 +14,24 @@ string progname;
 // forward reference:
 void scan(const string progid, const string p, const int copies=1);
 
+
 int main(int _argc, char** _argv){
+  char* namevar;
+  std::string hostname;
+  char* ipvar;
+  std::string ipbase;
+  std::string ipname;
+
   mypid = getpid();
   int argc(_argc);
   char** argv(_argv);
-  const string dirname("/var/qmail/greylist");
-  whatsit foo(argv[0], dirname); argc--; argv++;
+  const string parent_dir("/var/qmail/ltgrey");
+  whatsit foo(argv[0], parent_dir); argc--; argv++;
   int scanmode(0);
   int copies(1);
   int penalty(0);
   int stain(0);
-  int check(0);
+  int dnscheck(0);
   while (argc > 0) {
     string arg = argv[0]; argc--; argv++;
     if (prefix(arg, "-scan")) {
@@ -33,8 +40,8 @@ int main(int _argc, char** _argv){
       copies++;
     } else if (prefix(arg, "-verbose"))  {
       foo.verbosity++;
-    } else if (prefix(arg, "-check"))  {
-      check++;
+    } else if (prefix(arg, "-dnscheck"))  {
+      dnscheck++;
     } else if (prefix(arg, "-penalize")
         || prefix(arg, "-penalty"))  {
       if (!argc){
@@ -61,23 +68,29 @@ int main(int _argc, char** _argv){
   }
   if (foo.setup()) return ex_syserr;
 
+// dnscheck mode ...
+// Probably a better design would be to
+//  (a) make more thorough DNS checks, and
+//  (b) move all the DNS checking to a separate module
+
+  ipvar = getenv("TCPREMOTEIP");
+  if (ipvar) ipbase = ipvar;
+  namevar = getenv("TCPREMOTEHOST");
+  if (namevar) hostname = namevar;
+
+  if (dnscheck) {
+    exeunt(foo.check_dns(ipvar, namevar));
+  }
+
   if (scanmode) {
+    string dirname = parent_dir + "/quarante";
     scan(foo.progid, dirname, copies);
     return 0;
   }
 
   int sts = foo.doit(penalty, stain);
-  if (sts == ex_syserr) return sts;
-  if (!check) return ex_good;
-
-// check mode ... perform some extra checks.
-// Probably a better design would be to
-//  (a) make more thorough DNS checks, and
-//  (b) move all the DNS checking to a separate module
+  return sts;
 
-  int dns = foo.check_dns();
-  if (dns == ex_syserr || dns == ex_spam) return dns;
-  exeunt(sts);
 }
 
 //////////////////////////////////////////////////////////////////////