On Sun, Aug 14, 2016 at 01:54:40AM -0400, Ted Unangst wrote:
> As discovered by tb, different man pages call /etc/passwd different things.
> The legacy of these files is not, however, relevant to their daily operation
> and some 20 30? years later, "this file is like that one but different" is
> more confusing than helpful.
> 
> Are there other references to 6th edition or whatever?

ok.

Here are a few more, not entirely sure about the change in pw_lock.3.

Index: lib/libc/gen/getpwent.3
===================================================================
RCS file: /var/cvs/src/lib/libc/gen/getpwent.3,v
retrieving revision 1.30
diff -u -p -r1.30 getpwent.3
--- lib/libc/gen/getpwent.3     27 Oct 2015 04:41:18 -0000      1.30
+++ lib/libc/gen/getpwent.3     14 Aug 2016 06:20:48 -0000
@@ -131,7 +131,7 @@ secure password database file
 .It Pa /etc/master.passwd
 current password file
 .It Pa /etc/passwd
-a Version 7 format password file
+insecure password file
 .El
 .Sh ERRORS
 The
Index: lib/libc/gen/getpwnam.3
===================================================================
RCS file: /var/cvs/src/lib/libc/gen/getpwnam.3,v
retrieving revision 1.10
diff -u -p -r1.10 getpwnam.3
--- lib/libc/gen/getpwnam.3     18 Nov 2015 19:32:23 -0000      1.10
+++ lib/libc/gen/getpwnam.3     14 Aug 2016 06:21:06 -0000
@@ -199,7 +199,7 @@ secure password database file
 .It Pa /etc/master.passwd
 current password file
 .It Pa /etc/passwd
-a Version 7 format password file
+insecure password file
 .El
 .Sh ERRORS
 The
Index: lib/libutil/pw_init.3
===================================================================
RCS file: /var/cvs/src/lib/libutil/pw_init.3,v
retrieving revision 1.13
diff -u -p -r1.13 pw_init.3
--- lib/libutil/pw_init.3       14 Sep 2015 13:45:25 -0000      1.13
+++ lib/libutil/pw_init.3       14 Aug 2016 06:20:13 -0000
@@ -205,7 +205,7 @@ returns 1.
 .It Pa /etc/master.passwd
 Current password file.
 .It Pa /etc/passwd
-A Version 7 format password file.
+Insecure password file.
 .It Pa /etc/ptmp
 Password lock file.
 .It Pa /etc/pwd.db
Index: lib/libutil/pw_lock.3
===================================================================
RCS file: /var/cvs/src/lib/libutil/pw_lock.3,v
retrieving revision 1.19
diff -u -p -r1.19 pw_lock.3
--- lib/libutil/pw_lock.3       15 Oct 2015 19:35:24 -0000      1.19
+++ lib/libutil/pw_lock.3       14 Aug 2016 06:19:41 -0000
@@ -95,11 +95,12 @@ are specified by OR'ing the following va
 only update the secure database file
 .Pq Pa /etc/spwd.db .
 .It Dv _PASSWORD_OMITV7
-do not update the Version 7 format password file
+do not update the password file
 .Pq Pa /etc/passwd .
 .El
 .Pp
-By default the secure, insecure and Version 7 format password databases
+By default the secure and insecure password databases and the password file
+.Pa /etc/passwd
 are updated.
 You should finish writing to and close the file descriptor returned by
 .Fn pw_lock
@@ -129,7 +130,7 @@ function returns \-1 if it is unable to 
 .It Pa /etc/master.passwd
 Current password file.
 .It Pa /etc/passwd
-A Version 7 format password file.
+Insecure password file.
 .It Pa /etc/ptmp
 Password lock file.
 .It Pa /etc/pwd.db

Reply via email to