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

(-)SQLBasedAddrList.pm.orig (-2 / +21 lines)
Lines 130-138 sub new_checker { Link Here
130
  my $dsn    = $main->{conf}->{user_awl_dsn};
130
  my $dsn    = $main->{conf}->{user_awl_dsn};
131
  my $dbuser = $main->{conf}->{user_awl_sql_username};
131
  my $dbuser = $main->{conf}->{user_awl_sql_username};
132
  my $dbpass = $main->{conf}->{user_awl_sql_password};
132
  my $dbpass = $main->{conf}->{user_awl_sql_password};
133
 
134
  my $dbh;
133
135
134
  my $dbh = DBI->connect($dsn, $dbuser, $dbpass, {'PrintError' => 0});
136
  if( $dsn =~ /;/ ) {
135
137
    ##
138
    ## ok there's a semi-colon in there which means we're dealing
139
    ## with multiple hosts
140
    ## 
141
    my @multiple_dsns = split( /;/, $dsn);
142
    dbg("auto-whitelist: sql-based: Multiple DSNs provided.:".$dsn);
143
    for my $new_dsn (@multiple_dsns) {
144
      $dbh = DBI->connect($new_dsn, $dbuser, $dbpass, {'PrintError' => 0});
145
      if (! $dbh) {
146
        dbg("auto-whitelist: sql-based: Couldn't connect to dsn:$new_dsn.".DBI->errstr());
147
      } else {
148
        last;
149
      }
150
    }
151
  } else {
152
    $dbh = DBI->connect($dsn, $dbuser, $dbpass, {'PrintError' => 0});
153
  }
154
 
136
  if(!$dbh) {
155
  if(!$dbh) {
137
    dbg("auto-whitelist: sql-based unable to connect to database ($dsn) : " . DBI::errstr);
156
    dbg("auto-whitelist: sql-based unable to connect to database ($dsn) : " . DBI::errstr);
138
    return undef;
157
    return undef;

Return to bug 2197