From: Vsevolod Stakhov <vsevolod@rambler-co.ru>
Date: Mon, 2 Mar 2009 06:25:32 +0000 (+0300)
Subject: * Fix LMTP and DELIVERY parsing in config file while trying to get control credits
X-Git-Tag: 0.2.7~286
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db656e70f8d5a2e5522ef90d0b5127c8efe192ec;p=thirdparty%2Frspamd.git

* Fix LMTP and DELIVERY parsing in config file while trying to get control credits
---

diff --git a/rspamc.pl.in b/rspamc.pl.in
index 8caeb28a38..c8d7f07d0c 100755
--- a/rspamc.pl.in
+++ b/rspamc.pl.in
@@ -31,15 +31,21 @@ sub parse_config {
 
     open CONF, "< $cfg{'conf_file'}" or die "config file $cfg{'conf_file'} cannot be opened";
 
-    my $ctrl = 0;
+    my $ctrl = 0, $skip = 0;
     while (<CONF>) {
-        if ($_ =~ /control\s*{/i || $_ =~ /lmtp\s*{/i || $_ =~ /delivery\s*{/i) {
+        if ($_ =~ /control\s*{/i) {
             $ctrl = 1;
         }
         if ($ctrl && $_ =~ /}/) {
             $ctrl = 0;
         }
-        if (((!$is_ctrl && !$ctrl) || ($ctrl && $is_ctrl))
+        if ($_ =~ /lmtp\s*{/i || $_ =~ /delivery\s*{/i) {
+            $skip = 1;
+        }
+        if ($skip && $_ =~ /}/) {
+            $skip = 0;
+        }
+        if (!$skip && ((!$is_ctrl && !$ctrl) || ($ctrl && $is_ctrl))
                 && $_ =~ /^\s*bind_socket\s*=\s*((([^:]+):(\d+))|(\/\S*))/i) {
             if ($3 && $4) {
                 $cfg{'host'} = $3;