[Midnightbsd-cvs] src: usr.bin/passwd: sync

[laffer1 at midnightbsd.org]

Log Message:
-----------
sync

Modified Files:
--------------
    src/usr.bin/passwd:
        Makefile (r1.1.1.1 -> r1.2)
        passwd.1 (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: passwd.1
===================================================================
RCS file: /home/cvs/src/usr.bin/passwd/passwd.1,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.bin/passwd/passwd.1 -L usr.bin/passwd/passwd.1 -u -r1.1.1.1 -r1.2
--- usr.bin/passwd/passwd.1
+++ usr.bin/passwd/passwd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)passwd.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/passwd/passwd.1,v 1.30.2.1 2005/09/24 01:59:39 keramida Exp $
+.\" $FreeBSD: src/usr.bin/passwd/passwd.1,v 1.32.2.1 2007/11/14 19:25:04 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt PASSWD 1
@@ -98,6 +98,7 @@
 .Xr pwd_mkdb 8
 is used to update the password databases.
 .El
+.Pp
 When changing local or NIS password, the next password change date
 is set according to
 .Dq passwordtime
@@ -118,10 +119,10 @@
 database but does not exist locally,
 .Nm
 automatically switches into
-.Dq yppasswd
+.Nm yppasswd
 mode.
 If the specified
-user does not exist in either the local password database of the
+user does not exist in either the local password database or the
 NIS password maps,
 .Nm
 returns an error.
@@ -208,7 +209,9 @@
 slave server will work equally well.
 .It Fl o
 Do not automatically override the password authentication checks for the
-super-user on the NIS master server; assume 'old' mode instead.
+super-user on the NIS master server; assume
+.Dq old
+mode instead.
 This
 flag is of limited practical use but is useful for testing.
 .El
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/passwd/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.bin/passwd/Makefile -L usr.bin/passwd/Makefile -u -r1.1.1.1 -r1.2
--- usr.bin/passwd/Makefile
+++ usr.bin/passwd/Makefile
@@ -1,12 +1,14 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
-# $FreeBSD: src/usr.bin/passwd/Makefile,v 1.46 2004/12/29 08:16:39 ache Exp $
+# $FreeBSD: src/usr.bin/passwd/Makefile,v 1.47 2006/03/17 18:54:39 ru Exp $
+
+.include <bsd.own.mk>
 
 PROG	 = passwd
 BINOWN	 = root
 BINMODE	 = 4555
 DPADD	 = ${LIBPAM}
 LDADD	 = ${MINUSLPAM}
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 LINKS	 = ${BINDIR}/passwd ${BINDIR}/yppasswd
 MLINKS	 = passwd.1 yppasswd.1
 .endif