svn commit: r249479 - in head: contrib/openpam/lib lib/libpam

[Dag-Erling Smørgrav]

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}