projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8974d69
)
RT#37163: Disconnect Users via Radclient [got rid of ignore_error]
author
Jonathan Prykop
<jonathan@freeside.biz>
Mon, 27 Jul 2015 23:27:11 +0000
(18:27 -0500)
committer
Jonathan Prykop
<jonathan@freeside.biz>
Mon, 27 Jul 2015 23:58:22 +0000
(18:58 -0500)
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
dcb20bc
..
67f0c5c
100644
(file)
--- a/
FS/FS/part_export/sqlradius.pm
+++ b/
FS/FS/part_export/sqlradius.pm
@@
-80,10
+80,6
@@
tie %options, 'Tie::IxHash',
'disconnect_port' => {
label => 'Port to send disconnection requests to, default 1700',
},
'disconnect_port' => {
label => 'Port to send disconnection requests to, default 1700',
},
- 'disconnect_ignore_error' => {
- label => 'Ignore disconnection request errors',
- type => 'checkbox',
- },
;
$notes1 = <<'END';
;
$notes1 = <<'END';
@@
-270,7
+266,6
@@
sub _export_replace {
'disconnect_ssh' => $self->option('disconnect_ssh'),
'svc_acct_username' => $old->username,
'disconnect_port' => $self->option('disconnect_port'),
'disconnect_ssh' => $self->option('disconnect_ssh'),
'svc_acct_username' => $old->username,
'disconnect_port' => $self->option('disconnect_port'),
- 'ignore_error' => $self->option('disconnect_ignore_error'),
);
unless ( ref($err_or_queue) ) {
$dbh->rollback if $oldAutoCommit;
);
unless ( ref($err_or_queue) ) {
$dbh->rollback if $oldAutoCommit;
@@
-418,7
+413,6
@@
sub _export_delete {
'disconnect_ssh' => $self->option('disconnect_ssh'),
'svc_acct_username' => $svc_x->username,
'disconnect_port' => $self->option('disconnect_port'),
'disconnect_ssh' => $self->option('disconnect_ssh'),
'svc_acct_username' => $svc_x->username,
'disconnect_port' => $self->option('disconnect_port'),
- 'ignore_error' => $self->option('disconnect_ignore_error'),
);
return $err_or_queue unless ref($err_or_queue);
if ( $jobnum ) {
);
return $err_or_queue unless ref($err_or_queue);
if ( $jobnum ) {
@@
-1255,8
+1249,6
@@
I<svc_acct_username> - the user to be disconnected (required)
I<disconnect_port> - the port (on the nas) to send disconnect requests to (defaults to 1700)
I<disconnect_port> - the port (on the nas) to send disconnect requests to (defaults to 1700)
-I<ignore_error> - do not die on error with the disconnect request
-
Note this is NOT the opposite of sqlradius_connect.
=cut
Note this is NOT the opposite of sqlradius_connect.
=cut
@@
-1291,7
+1283,7
@@
sub sqlradius_user_disconnect {
if $error && (@$nas > 1);
$error = "No clients found"
unless @$nas;
if $error && (@$nas > 1);
$error = "No clients found"
unless @$nas;
- die $error if $error
&& !$opt{'ignore_error'}
;
+ die $error if $error;
return '';
}
return '';
}