View | Details | Raw Unified | Return to bug 3206
Collapse All | Expand All

(-)spamd.raw.orig (-16 / +4 lines)
Lines 781-790 Link Here
781
    }
781
    }
782
782
783
    if ($opt{'sql-config'} && !defined($current_user)) {
783
    if ($opt{'sql-config'} && !defined($current_user)) {
784
      unless (handle_user_sql('nobody')) {
784
      handle_user_sql('nobody');
785
	service_unavailable_error("Error fetching user preferences via SQL");
786
	exit;
787
      }
788
    }
785
    }
789
786
790
    if ($opt{'ldap-config'} && !defined($current_user)) {
787
    if ($opt{'ldap-config'} && !defined($current_user)) {
Lines 983-1001 Link Here
983
  if (!$opt{'user-config'})
980
  if (!$opt{'user-config'})
984
  {
981
  {
985
    if ($opt{'sql-config'}) {
982
    if ($opt{'sql-config'}) {
986
      unless (handle_user_sql($current_user)) {
983
      handle_user_sql($current_user);
987
	service_unavailable_error("Error fetching user preferences via SQL");
988
	exit;
989
      }	
990
    } elsif ($opt{'ldap-config'}) {
984
    } elsif ($opt{'ldap-config'}) {
991
      handle_user_ldap($current_user);
985
      handle_user_ldap($current_user);
992
    } elsif ($opt{'virtual-config-dir'}) {
986
    } elsif ($opt{'virtual-config-dir'}) {
993
      handle_virtual_config_dir($current_user);
987
      handle_virtual_config_dir($current_user);
994
    } elsif ($opt{'setuid-with-sql'}) {
988
    } elsif ($opt{'setuid-with-sql'}) {
995
      unless (handle_user_setuid_with_sql($current_user)) {
989
      handle_user_setuid_with_sql($current_user);
996
	service_unavailable_error("Error fetching user preferences via SQL");
997
	exit;
998
      }
999
      $setuid_to_user = 1; #to benefit from any paranoia.
990
      $setuid_to_user = 1; #to benefit from any paranoia.
1000
    } elsif ($opt{'setuid-with-ldap'}) {
991
    } elsif ($opt{'setuid-with-ldap'}) {
1001
      handle_user_setuid_with_ldap($current_user);
992
      handle_user_setuid_with_ldap($current_user);
Lines 1006-1015 Link Here
1006
  {
997
  {
1007
    handle_user($current_user);
998
    handle_user($current_user);
1008
    if ($opt{'sql-config'}) {
999
    if ($opt{'sql-config'}) {
1009
      unless (handle_user_sql($current_user)) {
1000
      handle_user_sql($current_user);
1010
	service_unavailable_error("Error fetching user preferences via SQL");
1011
	exit;
1012
      }
1013
    }
1001
    }
1014
  }
1002
  }
1015
  return 0;
1003
  return 0;

Return to bug 3206