--- spamd.raw.orig	Mon Apr 12 11:33:10 2004
+++ spamd.raw.orig	Mon Apr 12 11:35:12 2004
@@ -781,10 +781,7 @@ 
     }
 
     if ($opt{'sql-config'} && !defined($current_user)) {
-      unless (handle_user_sql('nobody')) {
-	service_unavailable_error("Error fetching user preferences via SQL");
-	exit;
-      }
+      handle_user_sql('nobody');
     }
 
     if ($opt{'ldap-config'} && !defined($current_user)) {
@@ -983,19 +980,13 @@ 
   if (!$opt{'user-config'})
   {
     if ($opt{'sql-config'}) {
-      unless (handle_user_sql($current_user)) {
-	service_unavailable_error("Error fetching user preferences via SQL");
-	exit;
-      }	
+      handle_user_sql($current_user);
     } elsif ($opt{'ldap-config'}) {
       handle_user_ldap($current_user);
     } elsif ($opt{'virtual-config-dir'}) {
       handle_virtual_config_dir($current_user);
     } elsif ($opt{'setuid-with-sql'}) {
-      unless (handle_user_setuid_with_sql($current_user)) {
-	service_unavailable_error("Error fetching user preferences via SQL");
-	exit;
-      }
+      handle_user_setuid_with_sql($current_user);
       $setuid_to_user = 1; #to benefit from any paranoia.
     } elsif ($opt{'setuid-with-ldap'}) {
       handle_user_setuid_with_ldap($current_user);
@@ -1006,10 +997,7 @@ 
   {
     handle_user($current_user);
     if ($opt{'sql-config'}) {
-      unless (handle_user_sql($current_user)) {
-	service_unavailable_error("Error fetching user preferences via SQL");
-	exit;
-      }
+      handle_user_sql($current_user);
     }
   }
   return 0;