[Midnightbsd-cvs] src [7543] trunk/lib/libpam/modules/pam_unix: fix some warnings

[laffer1 at midnightbsd.org]

Revision: 7543
          http://svnweb.midnightbsd.org/src/?rev=7543
Author:   laffer1
Date:     2016-04-20 08:57:56 -0400 (Wed, 20 Apr 2016)
Log Message:
-----------
fix some warnings

Modified Paths:
--------------
    trunk/lib/libpam/modules/pam_unix/Makefile
    trunk/lib/libpam/modules/pam_unix/pam_unix.8
    trunk/lib/libpam/modules/pam_unix/pam_unix.c

Modified: trunk/lib/libpam/modules/pam_unix/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_unix/Makefile	2016-04-16 17:50:38 UTC (rev 7542)
+++ trunk/lib/libpam/modules/pam_unix/Makefile	2016-04-20 12:57:56 UTC (rev 7543)
@@ -34,16 +34,14 @@
 #
 # $FreeBSD$
 
-NO_PROFILE=
-NO_INSTALLLIB=
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 LIB=	pam_unix
 SRCS=	pam_unix.c
 MAN=	pam_unix.8
 
-DPADD= ${LIBUTIL} ${LIBCRYPT}
-LDADD= -lutil -lcrypt
+DPADD+= ${LIBUTIL} ${LIBCRYPT}
+LDADD+= -lutil -lcrypt
 
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP

Modified: trunk/lib/libpam/modules/pam_unix/pam_unix.8
===================================================================
--- trunk/lib/libpam/modules/pam_unix/pam_unix.8	2016-04-16 17:50:38 UTC (rev 7542)
+++ trunk/lib/libpam/modules/pam_unix/pam_unix.8	2016-04-20 12:57:56 UTC (rev 7543)
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/9/lib/libpam/modules/pam_unix/pam_unix.8 247568 2013-03-01 19:42:50Z des $
 .\"
 .Dd June 20, 2009
 .Dt PAM_UNIX 8
@@ -199,3 +199,9 @@
 .Xr pam 8 ,
 .Xr pw 8 ,
 .Xr yp 8
+.Sh BUGS
+The
+.Nm
+module ignores the
+.Dv PAM_CHANGE_EXPIRED_AUTHTOK
+flag.

Modified: trunk/lib/libpam/modules/pam_unix/pam_unix.c
===================================================================
--- trunk/lib/libpam/modules/pam_unix/pam_unix.c	2016-04-16 17:50:38 UTC (rev 7542)
+++ trunk/lib/libpam/modules/pam_unix/pam_unix.c	2016-04-20 12:57:56 UTC (rev 7543)
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/9/lib/libpam/modules/pam_unix/pam_unix.c 247568 2013-03-01 19:42:50Z des $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
@@ -96,13 +96,13 @@
 	const char *pass, *user, *realpw, *prompt;
 
 	if (openpam_get_option(pamh, PAM_OPT_AUTH_AS_SELF)) {
-		pwd = getpwnam(getlogin());
+		user = getlogin();
 	} else {
 		retval = pam_get_user(pamh, &user, NULL);
 		if (retval != PAM_SUCCESS)
 			return (retval);
-		pwd = getpwnam(user);
 	}
+	pwd = getpwnam(user);
 
 	PAM_LOG("Got user: %s", user);