projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
2466702
)
don't abort upgrade if a RADIUS server is unreachable
author
Ivan Kohler
<ivan@freeside.biz>
Sun, 6 May 2012 17:39:59 +0000
(10:39 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Sun, 6 May 2012 17:39:59 +0000
(10:39 -0700)
FS/FS/part_export/sqlradius.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_export/sqlradius.pm
b/FS/FS/part_export/sqlradius.pm
index
910346b
..
57bbdb4
100644
(file)
--- a/
FS/FS/part_export/sqlradius.pm
+++ b/
FS/FS/part_export/sqlradius.pm
@@
-1154,8
+1154,13
@@
sub _upgrade_exporttype {
sub import_attrs {
my $self = shift;
- my $dbh =
sqlradius_
connect( map $self->option($_),
+ my $dbh =
DBI->
connect( map $self->option($_),
qw( datasrc username password ) );
+ unless ( $dbh ) {
+ warn "Error connecting to RADIUS server: $DBI::errstr\n";
+ return;
+ }
+
my $usergroup = $self->option('usergroup') || 'usergroup';
my $error;
warn "Importing RADIUS groups and attributes from ".$self->option('datasrc').