Mailing List Archive

Author: parker
Date: Sun Jun 20 11:35:06 2004
New Revision: 21514

Modified:
incubator/spamassassin/trunk/spamd/spamd.raw
Log:
Bug 3477: do not exit child when there is an error looking up SQL prefs

Modified: incubator/spamassassin/trunk/spamd/spamd.raw
==============================================================================
--- incubator/spamassassin/trunk/spamd/spamd.raw (original)
+++ incubator/spamassassin/trunk/spamd/spamd.raw Sun Jun 20 11:35:06 2004
@@ -1024,7 +1024,7 @@
if ( $opt{'sql-config'} && !defined($current_user) ) {
unless ( handle_user_sql('nobody') ) {
service_unavailable_error("Error fetching user preferences via SQL");
- exit;
+ return 1;
}
}

@@ -1257,7 +1257,7 @@
if ( $opt{'sql-config'} ) {
unless ( handle_user_sql($current_user) ) {
service_unavailable_error("Error fetching user preferences via SQL");
- exit;
+ return 1;
}
}
elsif ( $opt{'ldap-config'} ) {
@@ -1269,7 +1269,7 @@
elsif ( $opt{'setuid-with-sql'} ) {
unless ( handle_user_setuid_with_sql($current_user) ) {
service_unavailable_error("Error fetching user preferences via SQL");
- exit;
+ return 1;
}
$setuid_to_user = 1; #to benefit from any paranoia.
}
@@ -1283,7 +1283,7 @@
if ( $opt{'sql-config'} ) {
unless ( handle_user_sql($current_user) ) {
service_unavailable_error("Error fetching user preferences via SQL");
- exit;
+ return 1;
}
}
}