From owner-svn-src-all@FreeBSD.ORG  Sun Apr 14 16:49:28 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3AE1E3FA;
 Sun, 14 Apr 2013 16:49:28 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2D73E8EA;
 Sun, 14 Apr 2013 16:49:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3EGnS4G050808;
 Sun, 14 Apr 2013 16:49:28 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3EGnR24050805;
 Sun, 14 Apr 2013 16:49:27 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201304141649.r3EGnR24050805@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Sun, 14 Apr 2013 16:49:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249479 - in head: contrib/openpam/lib lib/libpam
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sun, 14 Apr 2013 16:49:28 -0000

Author: des
Date: Sun Apr 14 16:49:27 2013
New Revision: 249479
URL: http://svnweb.freebsd.org/changeset/base/249479

Log:
  Backport upstream r684 (OPENPAM_DEBUG enables debugging macros but does
  not turn debugging on by default) and add OPENPAM_DEBUG to CFLAGS.

Modified:
  head/contrib/openpam/lib/openpam_log.c
  head/lib/libpam/Makefile.inc

Modified: head/contrib/openpam/lib/openpam_log.c
==============================================================================
--- head/contrib/openpam/lib/openpam_log.c	Sun Apr 14 16:25:37 2013	(r249478)
+++ head/contrib/openpam/lib/openpam_log.c	Sun Apr 14 16:49:27 2013	(r249479)
@@ -49,11 +49,7 @@
 
 #include "openpam_impl.h"
 
-#ifdef OPENPAM_DEBUG
-int openpam_debug = 1;
-#else
 int openpam_debug = 0;
-#endif
 
 #if !defined(openpam_log)
 

Modified: head/lib/libpam/Makefile.inc
==============================================================================
--- head/lib/libpam/Makefile.inc	Sun Apr 14 16:25:37 2013	(r249478)
+++ head/lib/libpam/Makefile.inc	Sun Apr 14 16:49:27 2013	(r249479)
@@ -24,9 +24,7 @@
 #
 # $FreeBSD$
 
-.ifdef PAM_DEBUG
-DEBUG_FLAGS+=	-DDEBUG
-.endif
+CFLAGS+=	-DOPENPAM_DEBUG
 
 SHLIB_MAJOR=	5
 PAM_MOD_DIR=	${LIBDIR}