3 files changed, 20 insertions, 0 deletions

diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5
index cd1f65e79bd0..0ccfafd6b4af 100644
--- a/lib/libutil/login.conf.5
+++ b/lib/libutil/login.conf.5
@@ -202,6 +202,10 @@ ensure octal interpretation.
 .Bl -column minpasswordlen indent indent
 .Sy Name	Type	Notes	Description
 .It minpasswordlen	number	6	The minimum length a local password may be.
+.It passwd_format	string	md5	The encryption format that new or
+changed passwords will use.
+Valid values include "md5" and "des".
+NIS clients using a non-FreeBSD NIS server should probably use "des".
 .\" .It approve	program 	Program to approve login.
 .It mixpasswordcase	bool	true	Whether
 .Xr passwd 1
diff --git a/share/man/man4/yp.4 b/share/man/man4/yp.4
index 3ceab06412e1..045884006520 100644
--- a/share/man/man4/yp.4
+++ b/share/man/man4/yp.4
@@ -416,6 +416,14 @@ If they aren't found, the standard
 .Pa passwd
 maps will be used instead.
 .Sh COMPATIBILITY
+When using a non-FreeBSD NIS server for
+.Xr passwd 5
+files, it is unlikely that the default MD5-based format that FreeBSD
+uses for passwords will be accepted by it.
+If this is the case, the value of the "passwd_format" setting in
+.Xr login.conf 5
+should be changed to "des" for compatibility.
+.Pp
 Some systems, such as SunOS 4.x, need
 .Tn NIS
 to be running in order
diff --git a/share/man/man8/yp.8 b/share/man/man8/yp.8
index 3ceab06412e1..045884006520 100644
--- a/share/man/man8/yp.8
+++ b/share/man/man8/yp.8
@@ -416,6 +416,14 @@ If they aren't found, the standard
 .Pa passwd
 maps will be used instead.
 .Sh COMPATIBILITY
+When using a non-FreeBSD NIS server for
+.Xr passwd 5
+files, it is unlikely that the default MD5-based format that FreeBSD
+uses for passwords will be accepted by it.
+If this is the case, the value of the "passwd_format" setting in
+.Xr login.conf 5
+should be changed to "des" for compatibility.
+.Pp
 Some systems, such as SunOS 4.x, need
 .Tn NIS
 to be running in order