svn commit: r165275 - /spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm

[qu...@apache.org]

Author: quinlan
Date: Fri Apr 29 00:56:11 2005
New Revision: 165275

URL: http://svn.apache.org/viewcvs?rev=165275&view=rev
Log:
if an unknown conf type is used, just warn and skip the line, don't die

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=165275&r1=165274&r2=165275&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Fri Apr 29 00:56:11 2005
@@ -272,6 +272,8 @@
                   $self->{currentfile}.": if ".$cond->{conditional}."\n";
           }
           else {
+            # die seems a bit excessive here, but this shouldn't be possible
+            # so I suppose it's okay.
             die "config: unknown 'if' type: ".$cond->{type}."\n";
           }
 
@@ -366,7 +368,9 @@
       }
 
       if (!$cmd->{code}) {
-        $self->setup_default_code_cb ($cmd);
+        if (! $self->setup_default_code_cb($cmd)) {
+          goto failed_line;
+        }
       }
 
       my $ret = &{$cmd->{code}} ($conf, $cmd->{setting}, $value, $line);
@@ -560,8 +564,10 @@
     $cmd->{code} = \&set_template_append;
   }
   else {
-    die "config: unknown conf type $type!";
+    warn "config: unknown conf type $type!";
+    return 0;
   }
+  return 1;
 }
 
 sub set_numeric_value {