X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fshellcommands.pm;h=4431cc0c4da5c17cd5942e301f98b67d8383143e;hb=4e4a935e10dad30648d9d9ebb2069ca80217dc72;hp=1af5bb348b3e4a5f15055bb4202da735391c34c4;hpb=e53cf6b04ea8c6f10c331d46372c486128478df0;p=freeside.git

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 1af5bb348..4431cc0c4 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -83,7 +83,7 @@ running will not accept a domain as a parameter.  You will need to
       this.form.unsuspend_stdin.value="";
     '>
   <LI>
-    <INPUT TYPE="button" VALUE="FreeBSD before 5.3" onClick='
+    <INPUT TYPE="button" VALUE="FreeBSD before 4.10 / 5.3" onClick='
       this.form.useradd.value = "lockf /etc/passwd.lock pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0";
       this.form.useradd_stdin.value = "$_password\n";
       this.form.userdel.value = "lockf /etc/passwd.lock pw userdel $username -r"; this.form.userdel_stdin.value="";
@@ -92,14 +92,15 @@ running will not accept a domain as a parameter.  You will need to
       this.form.suspend_stdin.value="";
       this.form.unsuspend.value = "lockf /etc/passwd.lock pw unlock $username"; this.form.unsuspend_stdin.value="";
     '>
-    Note: On FreeBSD versions before 5.3, due to deficient locking in pw(1),
-    you must disable the chpass(1), chsh(1), chfn(1), passwd(1), and vipw(1)
-    commands, or replace them with wrappers that prepend
-    "lockf /etc/passwd.lock".  Alternatively, apply the patch in
+    Note: On FreeBSD versions before 5.3 and 4.10 (4.10 is after 4.9, not
+    4.1!), due to deficient locking in pw(1), you must disable the chpass(1),
+    chsh(1), chfn(1), passwd(1), and vipw(1) commands, or replace them with
+    wrappers that prepend "lockf /etc/passwd.lock".  Alternatively, apply the
+    patch in
     <A HREF="http://www.freebsd.org/cgi/query-pr.cgi?pr=23501">FreeBSD PR#23501</A>
-    and use the "FreeBSD 5.3 or later" button below.
+    and use the "FreeBSD 4.10 / 5.3 or later" button below.
   <LI>
-    <INPUT TYPE="button" VALUE="FreeBSD 5.3 or later" onClick='
+    <INPUT TYPE="button" VALUE="FreeBSD 4.10 / 5.3 or later" onClick='
       this.form.useradd.value = "pw useradd $username -d $dir -m -s $shell -u $uid -g $gid -c $finger -h 0";
       this.form.useradd_stdin.value = "$_password\n";
       this.form.userdel.value = "pw userdel $username -r";
@@ -153,6 +154,7 @@ old_ for replace operations):
   <LI><code>$dir</code> - home directory
   <LI><code>$shell</code>
   <LI><code>$quota</code>
+  <LI><code>@radius_groups</code>
   <LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.
 </UL>
 END
@@ -227,6 +229,8 @@ sub _export_command {
     );
   }
 
+  @radius_groups = $svc_acct->radius_groups;
+
   $self->shellcommands_queue( $svc_acct->svcnum,
     user         => $self->option('user')||'root',
     host         => $self->machine,
@@ -265,6 +269,9 @@ sub _export_replace {
     );
   }
 
+  @old_radius_groups = $old->radius_groups;
+  @new_radius_groups = $new->radius_groups;
+
   if ( $self->option('usermod_pwonly') ) {
     my $error = '';
     if ( $old_username ne $new_username ) {
@@ -279,6 +286,10 @@ sub _export_replace {
     if ( $old_dir ne $new_dir ) {
       $error ||= "can't change dir";
     }
+    if ( join("\n", sort @old_radius_groups) ne
+         join("\n", sort @new_radius_groups)    ) {
+      $error ||= "can't change RADIUS groups";
+    }
     return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
       if $error;
   }