my $method = "radius_$table";
my %attrib = $svc_acct->$method;
next unless keys %attrib;
- my $error = $self->sqlradius_queue( $svc_acct->svcnum, 'insert',
+ my $err_or_queue = $self->sqlradius_queue( $svc_acct->svcnum, 'insert',
$table, $svc_acct->username, %attrib );
- return $error if $error;
+ return $err_or_queue unless ref($err_or_queue);
}
my @groups = $svc_acct->radius_groups;
if ( @groups ) {
- my $error = $self->sqlradius_queue( $svc_acct->svcnum, 'usergroup_insert',
+ my $err_or_queue = $self->sqlradius_queue(
+ $svc_acct->svcnum, 'usergroup_insert',
$svc_acct->username, @groups );
- return $error if $error;
+ return $err_or_queue unless ref($err_or_queue);
}
'';
}
#return "can't (yet) change username with sqlradius"
# if $old->username ne $new->username;
if ( $old->username ne $new->username ) {
- my $error = $self->sqlradius_queue( $new->svcnum, 'rename',
+ my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'rename',
$new->username, $old->username );
- return $error if $error;
+ return $err_or_queue unless ref($err_or_queue);
}
foreach my $table (qw(reply check)) {
|| $new{$_} ne $old{$_} #changed
} keys %new
) {
- my $error = $self->sqlradius_queue( $new->svcnum, 'insert',
+ my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'insert',
$table, $new->username, %new );
- return $error if $error;
+ return $err_or_queue unless ref($err_or_queue);
}
my @del = grep { !exists $new{$_} } keys %old;
if ( @del ) {
- my $error = $self->sqlradius_queue( $new->svcnum, 'attrib_delete',
+ my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'attrib_delete',
$table, $new->username, @del );
- return $error if $error;
+ return $err_or_queue unless ref($err_or_queue);
}
}
}
if ( @delgroups ) {
- my $error = $self->sqlradius_queue( $new->svcnum, 'usergroup_delete',
+ my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'usergroup_delete',
$new->username, @delgroups );
- return $error if $error;
+ return $err_or_queue unless ref($err_or_queue);
}
if ( @newgroups ) {
- my $error = $self->sqlradius_queue( $new->svcnum, 'usergroup_insert',
+ my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'usergroup_insert',
$new->username, @newgroups );
- return $error if $error;
+ return $err_or_queue unless ref($err_or_queue);
}
'';
sub _export_delete {
my( $self, $svc_acct ) = (shift, shift);
- $self->sqlradius_queue( $svc_acct->svcnum, 'delete',
+ my $err_or_queue = $self->sqlradius_queue( $svc_acct->svcnum, 'delete',
$svc_acct->username );
+ ref($err_or_queue) ? '' : $err_or_queue;
}
sub sqlradius_queue {
$self->option('username'),
$self->option('password'),
@_,
- );
+ ) or $queue;
}
sub sqlradius_insert { #subroutine, not method
my $dbh = sqlradius_connect(shift, shift, shift);
- my( $replycheck, $username, %attributes ) = @_;
+ my( $table, $username, %attributes ) = @_;
foreach my $attribute ( keys %attributes ) {
- my $u_sth = $dbh->prepare(
- "UPDATE rad$replycheck SET Value = ? WHERE UserName = ? AND Attribute = ?" ) or die $dbh->errstr;
- my $i_sth = $dbh->prepare(
- "INSERT INTO rad$replycheck ( id, UserName, Attribute, Value ) ".
- "VALUES ( ?, ?, ?, ? )"
+
+ my $s_sth = $dbh->prepare(
+ "SELECT COUNT(*) FROM rad$table WHERE UserName = ? AND Attribute = ?"
) or die $dbh->errstr;
- $u_sth->execute($attributes{$attribute}, $username, $attribute) > 0
- or $i_sth->execute( '', $username, $attribute, $attributes{$attribute} )
- or die "can't insert into rad$replycheck table: ". $i_sth->errstr;
+ $s_sth->execute( $username, $attribute ) or die $s_sth->errstr;
+
+ if ( $s_sth->fetchrow_arrayref->[0] ) {
+
+ my $u_sth = $dbh->prepare(
+ "UPDATE rad$table SET Value = ? WHERE UserName = ? AND Attribute = ?"
+ ) or die $dbh->errstr;
+ $u_sth->execute($attributes{$attribute}, $username, $attribute)
+ or die $u_sth->errstr;
+
+ } else {
+
+ my $i_sth = $dbh->prepare(
+ "INSERT INTO rad$table ( id, UserName, Attribute, Value ) ".
+ "VALUES ( ?, ?, ?, ? )"
+ ) or die $dbh->errstr;
+ $i_sth->execute( '', $username, $attribute, $attributes{$attribute} )
+ or die $i_sth->errstr;
+
+ }
+
}
$dbh->disconnect;
}
my( $username, @groups ) = @_;
my $sth = $dbh->prepare(
- "DELETE FROM usergroup ( id, UserName, GroupName ) VALUES ( ?, ?, ? )"
+ "DELETE FROM usergroup WHERE UserName = ? AND GroupName = ?"
) or die $dbh->errstr;
foreach my $group ( @groups ) {
- $sth->execute( '', $username, $group )
+ $sth->execute( $username, $group )
or die "can't delete from groupname table: ". $sth->errstr;
}
$dbh->disconnect;
sub sqlradius_attrib_delete { #subroutine, not method
my $dbh = sqlradius_connect(shift, shift, shift);
- my( $replycheck, $username, @attrib ) = @_;
+ my( $table, $username, @attrib ) = @_;
foreach my $attribute ( @attrib ) {
my $sth = $dbh->prepare(
- "DELETE FROM rad$replycheck WHERE UserName = ? AND Attribute = ?" )
+ "DELETE FROM rad$table WHERE UserName = ? AND Attribute = ?" )
or die $dbh->errstr;
$sth->execute($username,$attribute)
- or die "can't delete from rad$replycheck table: ". $sth->errstr;
+ or die "can't delete from rad$table table: ". $sth->errstr;
}
$dbh->disconnect;
}