From owner-svn-src-all@FreeBSD.ORG  Wed Jan 18 18:26:56 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B31041065676;
	Wed, 18 Jan 2012 18:26:56 +0000 (UTC)
	(envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A1D0D8FC17;
	Wed, 18 Jan 2012 18:26:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0IIQuZb051826;
	Wed, 18 Jan 2012 18:26:56 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0IIQuLX051824;
	Wed, 18 Jan 2012 18:26:56 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201201181826.q0IIQuLX051824@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 18 Jan 2012 18:26:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230311 - head/lib/libpam/modules/pam_unix
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Jan 2012 18:26:56 -0000

Author: peter
Date: Wed Jan 18 18:26:56 2012
New Revision: 230311
URL: http://svn.freebsd.org/changeset/base/230311

Log:
  Rev 228065 (change bsd.own.mk -> bsd.init.mk) broke pam_unix.so by causing
  the LDADD/DPADD to lose the -lpam, and causing openpam_dynamic() to fail
  due to "openpam_get_options" being undefined.
  
  This would cause obscure console log messages like:
    openpam_dynamic(): No error: 0
    openpam_load_module(): no pam_unix.so found
  and other helpful messages which are no help in diagnosing the problem.
  
  Fortunately this change was not mfc'ed to 9.x, it isn't broken there.

Modified:
  head/lib/libpam/modules/pam_unix/Makefile

Modified: head/lib/libpam/modules/pam_unix/Makefile
==============================================================================
--- head/lib/libpam/modules/pam_unix/Makefile	Wed Jan 18 18:22:25 2012	(r230310)
+++ head/lib/libpam/modules/pam_unix/Makefile	Wed Jan 18 18:26:56 2012	(r230311)
@@ -40,8 +40,8 @@ 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