fix attribute importing bugs that borked the passwords

[freeside.git] / bin / sqlradius.import

diff --git a/bin/sqlradius.import b/bin/sqlradius.import
index 7203365..e75f65b 100644 (file)
--- a/bin/sqlradius.import
+++ b/bin/sqlradius.import
@@ -116,8 +116,8 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) {
   $rc_sth->execute($r_username, $realm) or die $rc_sth->errstr;
 
   foreach my $rc_row ( @{$rc_sth->fetchall_arrayref} ) {
   $rc_sth->execute($r_username, $realm) or die $rc_sth->errstr;
 
   foreach my $rc_row ( @{$rc_sth->fetchall_arrayref} ) {

-    my($attribute, $value, $name, $groupname) = @$row;
-    if ( $attribute =~ /^(Crypt-)?Password$/ ) {
+    my($attribute, $value, $name, $groupname) = @$rc_row;
+    if ( $attribute =~ /^((User|Crypt)-)?Password$/ ) {

       $password = $value;
       $finger = $name;
       $group = $groupname;
       $password = $value;
       $finger = $name;
       $group = $groupname;


@@ -134,9 +134,8 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) {
     'finger'    => $finger,
   };
 
     'finger'    => $finger,
   };
 

-  my($error);
-  $error = $svc_acct->insert;
-  #$error = $svc_acct->check;
+  my $error = $svc_acct->insert;
+  #my $error = $svc_acct->check;

   if ( $error ) {
     if ( $error =~ /duplicate/i ) {
       warn "$r_username / $realm: $error";
   if ( $error ) {
     if ( $error =~ /duplicate/i ) {
       warn "$r_username / $realm: $error";