[freeside-commits] freeside/FS/FS/part_export sqlradius.pm, 1.48, 1.48.2.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_export
In directory wavetail.420.am:/tmp/cvs-serv7197

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	sqlradius.pm 
Log Message:
don't change RADIUS password if there's a group change, RT#14398

Index: sqlradius.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/sqlradius.pm,v
retrieving revision 1.48
retrieving revision 1.48.2.1
diff -u -w -d -r1.48 -r1.48.2.1
--- sqlradius.pm	1 Jul 2011 06:54:02 -0000	1.48
+++ sqlradius.pm	17 Oct 2011 23:53:19 -0000	1.48.2.1
@@ -251,6 +251,10 @@
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  my @newgroups = $self->suspended_usergroups($svc_acct);
+
+  unless (@newgroups) { #don't change password if assigning to a suspended group
+
   my $err_or_queue = $self->sqlradius_queue( $new->svcnum, 'insert',
     'check', $self->export_username($new), $new->radius_check );
   unless ( ref($err_or_queue) ) {
@@ -258,9 +262,9 @@
     return $err_or_queue;
   }
 
-  my $error;
-  my (@newgroups) = $self->suspended_usergroups($svc_acct);
-  $error =
+  }
+
+  my $error =
     $self->sqlreplace_usergroups( $new->svcnum,
                                   $self->export_username($new),
 				  '',