From: ivan <ivan>
Date: Mon, 29 Mar 2004 21:49:09 +0000 (+0000)
Subject: freebsd pw(1) fixed in 4.10 also
X-Git-Tag: NET_WHOIS_RAW_0_31~22
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=6d2919c41c3f360f4e5b683c699f78ba42f30f49

freebsd pw(1) fixed in 4.10 also
---

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 1af5bb348..78f9e9690 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";