diff options
45 files changed, 183 insertions, 108 deletions
@@ -1,5 +1,55 @@ 2009-06-26 Thorsten Kukuk <kukuk@thkukuk.de> + * modules/pam_namespace/Makefile.am: Fix make maintainer-clean, + fix docu dependencies. + + * modules/pam_xauth/Makefile.am: Fix make maintainer-clean. + * modules/pam_access/Makefile.am: Likewise. + * modules/pam_debug/Makefile.am: Likewise. + * modules/pam_deny/Makefile.am: Likewise. + * modules/pam_echo/Makefile.am: Likewise. + * modules/pam_env/Makefile.am: Likewise. + * modules/pam_faildelay/Makefile.am: Likewise. + * modules/pam_ftp/Makefile.am: Likewise. + * modules/pam_group/Makefile.am: Likewise. + * modules/pam_issue/Makefile.am: Likewise. + * modules/pam_keyinit/Makefile.am: Likewise. + * modules/pam_lastlog/Makefile.am: Likewise. + * modules/pam_limits/Makefile.am: Likewise. + * modules/pam_listfile/Makefile.am: Likewise. + * modules/pam_localuser/Makefile.am: Likewise. + * modules/pam_loginuid/Makefile.am: Likewise. + * modules/pam_mail/Makefile.am: Likewise. + * modules/pam_mkhomedir/Makefile.am: Likewise. + * modules/pam_motd/Makefile.am: Likewise. + * modules/pam_nologin/Makefile.am: Likewise. + * modules/pam_pwhistory/Makefile.am: Likewise. + * modules/pam_rhosts/Makefile.am: Likewise. + * modules/pam_rootok/Makefile.am: Likewise. + * modules/pam_securetty/Makefile.am: Likewise. + * modules/pam_shells/Makefile.am: Likewise. + * modules/pam_succeed_if/Makefile.am: Likewise. + * modules/pam_tally2/Makefile.am: Likewise. + * modules/pam_tally/Makefile.am: Likewise. + * modules/pam_time/Makefile.am: Likewise. + * modules/pam_timestamp/Makefile.am: Likewise. + * modules/pam_tty_audit/Makefile.am: Likewise. + * modules/pam_umask/Makefile.am: Likewise. + * modules/pam_unix/Makefile.am: Likewise. + * modules/pam_warn/Makefile.am: Likewise. + * modules/pam_wheel/Makefile.am: Likewise. + * modules/pam_filter/Makefile.am: Likewise. + + * configure.in: Make regeneration of docu configureable, + rename enable_man to enable_docu. + + * modules/pam_env/pam_env.c (_pam_parse): Fix typo in debug + code. + + * modules/pam_cracklib/Makefile.am: Don't install docu if + module is disabled for building. + * modules/pam_userdb/Makefile.am: Likewise. + * modules/pam_unix/pam_unix_passwd.c: Remove dead SELinux code. diff --git a/configure.in b/configure.in index 3e03b5aa..b7d88003 100644 --- a/configure.in +++ b/configure.in @@ -465,31 +465,33 @@ AC_CHECK_FUNCS(inet_ntop inet_pton ruserok_af) AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no]) AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes]) +AC_ARG_ENABLE([regenerate-docu], + AC_HELP_STRING([--disable-regenerate-docu], [Don't re-build documentation from XML souces]), + [enable_docu=$enableval], [enable_docu=yes]) dnl dnl Check for xsltproc dnl -enable_man=yes AC_PATH_PROG([XSLTPROC], [xsltproc]) if test -z "$XSLTPROC"; then - enable_man=no + enable_docu=no fi AC_PATH_PROG([XMLLINT], [xmllint],[/bin/true]) dnl check for DocBook DTD and stylesheets in the local catalog. JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.4//EN], - [DocBook XML DTD V4.4], [], enable_man=no) + [DocBook XML DTD V4.4], [], enable_docu=no) JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], - [DocBook XSL Stylesheets], [], enable_man=no) + [DocBook XSL Stylesheets], [], enable_docu=no) AC_PATH_PROG([BROWSER], [w3m]) if test ! -z "$BROWSER"; then BROWSER="$BROWSER -T text/html -dump" else - enable_man=no + enable_docu=no fi AC_PATH_PROG([FO2PDF], [fop]) -AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno) +AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_docu != xno) AM_CONDITIONAL(ENABLE_GENERATE_PDF, test ! -z "$FO2PDF") diff --git a/modules/pam_access/Makefile.am b/modules/pam_access/Makefile.am index 9b58e81e..b4fea7df 100644 --- a/modules/pam_access/Makefile.am +++ b/modules/pam_access/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@thkukuk.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@thkukuk.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README access.conf $(MANS) $(XMLS) tst-pam_access diff --git a/modules/pam_cracklib/Makefile.am b/modules/pam_cracklib/Makefile.am index 619ffc93..57ddd675 100644 --- a/modules/pam_cracklib/Makefile.am +++ b/modules/pam_cracklib/Makefile.am @@ -1,12 +1,16 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README -EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_cracklib +EXTRA_DIST = README $(XMLS) pam_cracklib.8 tst-pam_cracklib -man_MANS = pam_cracklib.8 +if HAVE_LIBCRACK + TESTS = tst-pam_cracklib + man_MANS = pam_cracklib.8 +endif XMLS = README.xml pam_cracklib.8.xml @@ -18,21 +22,14 @@ AM_LDFLAGS = -no-undefined -avoid-version -module if HAVE_VERSIONING AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif - -if HAVE_LIBCRACK -securelib_LTLIBRARIES = pam_cracklib.la - -TESTS = tst-pam_cracklib -endif - pam_cracklib_la_LIBADD = -L$(top_builddir)/libpam -lpam \ @LIBCRACK@ @LIBCRYPT@ +if HAVE_LIBCRACK + securelib_LTLIBRARIES = pam_cracklib.la +endif if ENABLE_REGENERATE_MAN - -noinst_DATA = README - +noinst_DATA = README pam_cracklib.8 README: pam_cracklib.8.xml - -include $(top_srcdir)/Make.xml.rules endif diff --git a/modules/pam_debug/Makefile.am b/modules/pam_debug/Makefile.am index 0b798516..d87af88f 100644 --- a/modules/pam_debug/Makefile.am +++ b/modules/pam_debug/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@thkukuk.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@thkukuk.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_debug @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_debug.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_deny/Makefile.am b/modules/pam_deny/Makefile.am index 94b5f0f6..118928a1 100644 --- a/modules/pam_deny/Makefile.am +++ b/modules/pam_deny/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_deny diff --git a/modules/pam_echo/Makefile.am b/modules/pam_echo/Makefile.am index d004e8f4..265e3a07 100644 --- a/modules/pam_echo/Makefile.am +++ b/modules/pam_echo/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@thkukuk.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@thkukuk.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_echo diff --git a/modules/pam_env/Makefile.am b/modules/pam_env/Makefile.am index 87813688..d39aad80 100644 --- a/modules/pam_env/Makefile.am +++ b/modules/pam_env/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README pam_env.conf $(MANS) $(XMLS) tst-pam_env environment diff --git a/modules/pam_env/pam_env.c b/modules/pam_env/pam_env.c index 395ada21..84953104 100644 --- a/modules/pam_env/pam_env.c +++ b/modules/pam_env/pam_env.c @@ -120,7 +120,7 @@ _pam_parse (const pam_handle_t *pamh, int argc, const char **argv, "user_envfile= specification missing argument - ignored"); } else { *user_envfile = 13+*argv; - D(("new User Env File: %s", *user_env_file)); + D(("new User Env File: %s", *user_envfile)); } } else if (!strncmp(*argv,"readenv=",8)) *readenv = atoi(8+*argv); diff --git a/modules/pam_exec/Makefile.am b/modules/pam_exec/Makefile.am index 55fe9297..2838d1de 100644 --- a/modules/pam_exec/Makefile.am +++ b/modules/pam_exec/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_exec diff --git a/modules/pam_faildelay/Makefile.am b/modules/pam_faildelay/Makefile.am index 2796018c..2a4a2b07 100644 --- a/modules/pam_faildelay/Makefile.am +++ b/modules/pam_faildelay/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_faildelay @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_faildelay.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_filter/Makefile.am b/modules/pam_filter/Makefile.am index ab2ceee9..eddb08af 100644 --- a/modules/pam_filter/Makefile.am +++ b/modules/pam_filter/Makefile.am @@ -1,10 +1,11 @@ # -# Copyright (c) 2005, 2006, 2007 Thorsten Kukuk <kukuk@thkukuk.de> +# Copyright (c) 2005, 2006, 2007, 2009 Thorsten Kukuk <kukuk@thkukuk.de> # SUBDIRS = upperLOWER CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_filter @@ -31,4 +32,3 @@ noinst_DATA = README README: pam_filter.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_ftp/Makefile.am b/modules/pam_ftp/Makefile.am index a4ce03df..4401399b 100644 --- a/modules/pam_ftp/Makefile.am +++ b/modules/pam_ftp/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_ftp @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_ftp.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_group/Makefile.am b/modules/pam_group/Makefile.am index 22dc831b..0fd2a5d2 100644 --- a/modules/pam_group/Makefile.am +++ b/modules/pam_group/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README group.conf $(MANS) $(XMLS) tst-pam_group @@ -31,4 +32,3 @@ noinst_DATA = README README: pam_group.8.xml group.conf.5.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_issue/Makefile.am b/modules/pam_issue/Makefile.am index 8161fd81..40d5c1ab 100644 --- a/modules/pam_issue/Makefile.am +++ b/modules/pam_issue/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_issue @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_issue.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_keyinit/Makefile.am b/modules/pam_keyinit/Makefile.am index 5039705a..4416c1c1 100644 --- a/modules/pam_keyinit/Makefile.am +++ b/modules/pam_keyinit/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2006 David Howells <dhowells@redhat.com> +# Copyright (c) 2006, 2009 David Howells <dhowells@redhat.com> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(XMLS) pam_keyinit.8 tst-pam_keyinit XMLS = README.xml pam_keyinit.8.xml diff --git a/modules/pam_lastlog/Makefile.am b/modules/pam_lastlog/Makefile.am index 899bda7b..88bab272 100644 --- a/modules/pam_lastlog/Makefile.am +++ b/modules/pam_lastlog/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README securelibdir = $(SECUREDIR) secureconfdir = $(SCONFIGDIR) @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_lastlog.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_limits/Makefile.am b/modules/pam_limits/Makefile.am index 13232ea6..78943736 100644 --- a/modules/pam_limits/Makefile.am +++ b/modules/pam_limits/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) limits.conf tst-pam_limits diff --git a/modules/pam_listfile/Makefile.am b/modules/pam_listfile/Makefile.am index 2f211320..15466257 100644 --- a/modules/pam_listfile/Makefile.am +++ b/modules/pam_listfile/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_listfile @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_listfile.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_localuser/Makefile.am b/modules/pam_localuser/Makefile.am index d4e47937..c7deac3f 100644 --- a/modules/pam_localuser/Makefile.am +++ b/modules/pam_localuser/Makefile.am @@ -1,10 +1,11 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README -EXTRA_DIST = README ${MANS} $(XMLS) tst-pam_localuser +EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_localuser TESTS = tst-pam_localuser @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_localuser.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_loginuid/Makefile.am b/modules/pam_loginuid/Makefile.am index 636db963..4a715f1b 100644 --- a/modules/pam_loginuid/Makefile.am +++ b/modules/pam_loginuid/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2006 Thorsten Kukuk <kukuk@thkukuk.de> +# Copyright (c) 2006, 2009 Thorsten Kukuk <kukuk@thkukuk.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_loginuid diff --git a/modules/pam_mail/Makefile.am b/modules/pam_mail/Makefile.am index 0b5d2d70..c63a2bc2 100644 --- a/modules/pam_mail/Makefile.am +++ b/modules/pam_mail/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_mail @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_mail.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_mkhomedir/Makefile.am b/modules/pam_mkhomedir/Makefile.am index 42031472..7fe66056 100644 --- a/modules/pam_mkhomedir/Makefile.am +++ b/modules/pam_mkhomedir/Makefile.am @@ -1,9 +1,10 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # Copyright (c) 2008 Red Hat, Inc. # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_mkhomedir @@ -36,4 +37,3 @@ noinst_DATA = README README: pam_mkhomedir.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_motd/Makefile.am b/modules/pam_motd/Makefile.am index 872e5d37..ec6cd57a 100644 --- a/modules/pam_motd/Makefile.am +++ b/modules/pam_motd/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_motd @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_motd.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am index 05d47cf3..44513de0 100644 --- a/modules/pam_namespace/Makefile.am +++ b/modules/pam_namespace/Makefile.am @@ -1,21 +1,22 @@ # +# Copyright (c) 2009 Thorsten Kukuk <kukuk@thkukuk.de> # Copyright (c) 2006 Red Hat, Inc. # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MAN5) $(MAN8) README + MAN5 = namespace.conf.5 MAN8 = pam_namespace.8 -XMLS = README.xml namespace.conf.5.xml pam_namespace.8.xml +EXTRA_DIST = README namespace.conf namespace.init $(MAN5) $(MAN8) $(XMLS) tst-pam_namespace -if ENABLE_REGENERATE_MAN -noinst_DATA = README --include $(top_srcdir)/Make.xml.rules +if HAVE_UNSHARE + TESTS = tst-pam_namespace + man_MANS = $(MAN5) $(MAN8) endif -EXTRA_DIST = README namespace.conf namespace.init $(MAN5) $(MAN8) $(XMLS) tst-pam_namespace - -noinst_HEADERS = md5.h pam_namespace.h argv_parse.h +XMLS = README.xml namespace.conf.5.xml pam_namespace.8.xml securelibdir = $(SECUREDIR) secureconfdir = $(SCONFIGDIR) @@ -28,15 +29,21 @@ if HAVE_VERSIONING AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif +noinst_HEADERS = md5.h pam_namespace.h argv_parse.h + if HAVE_UNSHARE -securelib_LTLIBRARIES = pam_namespace.la -pam_namespace_la_SOURCES = pam_namespace.c md5.c argv_parse.c -pam_namespace_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@ + securelib_LTLIBRARIES = pam_namespace.la + pam_namespace_la_SOURCES = pam_namespace.c md5.c argv_parse.c + pam_namespace_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@ -secureconf_DATA = namespace.conf -secureconf_SCRIPTS = namespace.init -namespaced_DATA = + secureconf_DATA = namespace.conf + secureconf_SCRIPTS = namespace.init + namespaced_DATA = +endif -TESTS = tst-pam_namespace -man_MANS = $(MAN5) $(MAN8) + +if ENABLE_REGENERATE_MAN +noinst_DATA = README +README: pam_namespace.8.xml namespace.conf.5.xml +-include $(top_srcdir)/Make.xml.rules endif diff --git a/modules/pam_nologin/Makefile.am b/modules/pam_nologin/Makefile.am index 02840dde..f2bcfab1 100644 --- a/modules/pam_nologin/Makefile.am +++ b/modules/pam_nologin/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_nologin @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_nologin.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_permit/Makefile.am b/modules/pam_permit/Makefile.am index aa6db7a1..5d251323 100644 --- a/modules/pam_permit/Makefile.am +++ b/modules/pam_permit/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_permit @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_permit.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_pwhistory/Makefile.am b/modules/pam_pwhistory/Makefile.am index 018d0b52..4c24c275 100644 --- a/modules/pam_pwhistory/Makefile.am +++ b/modules/pam_pwhistory/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2008 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2008, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_pwhistory @@ -32,4 +33,3 @@ noinst_DATA = README README: pam_pwhistory.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_rhosts/Makefile.am b/modules/pam_rhosts/Makefile.am index 547ad621..7ffd4b78 100644 --- a/modules/pam_rhosts/Makefile.am +++ b/modules/pam_rhosts/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006, 2008 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2008, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_rhosts @@ -29,4 +30,3 @@ noinst_DATA = README README: pam_rhosts.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_rootok/Makefile.am b/modules/pam_rootok/Makefile.am index 54fe2720..81969fc4 100644 --- a/modules/pam_rootok/Makefile.am +++ b/modules/pam_rootok/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_rootok diff --git a/modules/pam_securetty/Makefile.am b/modules/pam_securetty/Makefile.am index dd8d9473..092b6773 100644 --- a/modules/pam_securetty/Makefile.am +++ b/modules/pam_securetty/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_securetty diff --git a/modules/pam_shells/Makefile.am b/modules/pam_shells/Makefile.am index 543e01b4..f4abbb44 100644 --- a/modules/pam_shells/Makefile.am +++ b/modules/pam_shells/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_shells @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_shells.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_stress/Makefile.am b/modules/pam_stress/Makefile.am index b5f80938..ff33817b 100644 --- a/modules/pam_stress/Makefile.am +++ b/modules/pam_stress/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ diff --git a/modules/pam_succeed_if/Makefile.am b/modules/pam_succeed_if/Makefile.am index 0394f42d..49b5d46c 100644 --- a/modules/pam_succeed_if/Makefile.am +++ b/modules/pam_succeed_if/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README ${MANS} ${XMLS} tst-pam_succeed_if diff --git a/modules/pam_tally/Makefile.am b/modules/pam_tally/Makefile.am index c4c181a9..e5b95592 100644 --- a/modules/pam_tally/Makefile.am +++ b/modules/pam_tally/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006, 2007 Thorsten Kukuk <kukuk@thkukuk.de> +# Copyright (c) 2005, 2006, 2007, 2009 Thorsten Kukuk <kukuk@thkukuk.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_tally diff --git a/modules/pam_tally2/Makefile.am b/modules/pam_tally2/Makefile.am index 06cdf554..507c2942 100644 --- a/modules/pam_tally2/Makefile.am +++ b/modules/pam_tally2/Makefile.am @@ -1,9 +1,10 @@ # -# Copyright (c) 2005, 2006, 2007 Thorsten Kukuk <kukuk@thkukuk.de> +# Copyright (c) 2005, 2006, 2007, 2009 Thorsten Kukuk <kukuk@thkukuk.de> # Copyright (c) 2008 Red Hat, Inc. # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_tally2 diff --git a/modules/pam_time/Makefile.am b/modules/pam_time/Makefile.am index 9c63ee5e..d2ef636c 100644 --- a/modules/pam_time/Makefile.am +++ b/modules/pam_time/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) time.conf tst-pam_time diff --git a/modules/pam_timestamp/Makefile.am b/modules/pam_timestamp/Makefile.am index 37cbabf9..313c1eb7 100644 --- a/modules/pam_timestamp/Makefile.am +++ b/modules/pam_timestamp/Makefile.am @@ -1,9 +1,10 @@ # -# Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2009 Thorsten Kukuk <kukuk@suse.de> # Copyright (c) 2005, 2008 Red Hat, Inc. # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README XMLS = README.xml pam_timestamp.8.xml pam_timestamp_check.8.xml man_MANS = pam_timestamp.8 pam_timestamp_check.8 @@ -44,4 +45,4 @@ README: pam_timestamp.8.xml -include $(top_srcdir)/Make.xml.rules endif -noinst_PROGRAMS = hmacfile +noinst_PROGRAMS = hmacfile diff --git a/modules/pam_tty_audit/Makefile.am b/modules/pam_tty_audit/Makefile.am index 5bb64585..fce439ce 100644 --- a/modules/pam_tty_audit/Makefile.am +++ b/modules/pam_tty_audit/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) @@ -27,4 +28,3 @@ noinst_DATA = README README: pam_tty_audit.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_umask/Makefile.am b/modules/pam_umask/Makefile.am index 53a666aa..397c5398 100644 --- a/modules/pam_umask/Makefile.am +++ b/modules/pam_umask/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_umask @@ -29,4 +30,3 @@ noinst_DATA = README README: pam_umask.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am index c4f746c9..44b37e94 100644 --- a/modules/pam_unix/Makefile.am +++ b/modules/pam_unix/Makefile.am @@ -1,11 +1,12 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README md5.c md5_crypt.c lckpwdf.-c $(MANS) CHANGELOG \ - tst-pam_unix $(XMLS) + tst-pam_unix $(XMLS) man_MANS = pam_unix.8 unix_chkpwd.8 unix_update.8 XMLS = README.xml pam_unix.8.xml unix_chkpwd.8.xml unix_update.8.xml @@ -49,13 +50,13 @@ bigcrypt_LDADD = @LIBCRYPT@ unix_chkpwd_SOURCES = unix_chkpwd.c md5_good.c md5_broken.c bigcrypt.c \ passverify.c unix_chkpwd_CFLAGS = $(AM_CFLAGS) @PIE_CFLAGS@ -DHELPER_COMPILE=\"unix_chkpwd\" -unix_chkpwd_LDFLAGS = @PIE_LDFLAGS@ +unix_chkpwd_LDFLAGS = @PIE_LDFLAGS@ unix_chkpwd_LDADD = @LIBCRYPT@ @LIBSELINUX@ @LIBAUDIT@ unix_update_SOURCES = unix_update.c md5_good.c md5_broken.c bigcrypt.c \ passverify.c unix_update_CFLAGS = $(AM_CFLAGS) @PIE_CFLAGS@ -DHELPER_COMPILE=\"unix_update\" -unix_update_LDFLAGS = @PIE_LDFLAGS@ +unix_update_LDFLAGS = @PIE_LDFLAGS@ unix_update_LDADD = @LIBCRYPT@ @LIBSELINUX@ if ENABLE_REGENERATE_MAN @@ -63,4 +64,3 @@ noinst_DATA = README README: pam_unix.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_userdb/Makefile.am b/modules/pam_userdb/Makefile.am index a442ef83..b05cc6c6 100644 --- a/modules/pam_userdb/Makefile.am +++ b/modules/pam_userdb/Makefile.am @@ -1,12 +1,17 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@thkukuk.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README -EXTRA_DIST = README $(MANS) $(XMLS) create.pl tst-pam_userdb +EXTRA_DIST = README $(XMLS) pam_userdb.8 create.pl tst-pam_userdb + +if HAVE_LIBDB + man_MANS = pam_userdb.8 + TESTS = tst-pam_userdb +endif -man_MANS = pam_userdb.8 XMLS = README.xml pam_userdb.8.xml securelibdir = $(SECUREDIR) @@ -21,13 +26,12 @@ endif if HAVE_LIBDB securelib_LTLIBRARIES = pam_userdb.la - TESTS = tst-pam_userdb endif noinst_HEADERS = pam_userdb.h if ENABLE_REGENERATE_MAN -noinst_DATA = README +noinst_DATA = README pam_userdb.8 README: pam_userdb.8.xml -include $(top_srcdir)/Make.xml.rules endif diff --git a/modules/pam_warn/Makefile.am b/modules/pam_warn/Makefile.am index 6ecc1362..75cf38a5 100644 --- a/modules/pam_warn/Makefile.am +++ b/modules/pam_warn/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_warn @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_warn.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_wheel/Makefile.am b/modules/pam_wheel/Makefile.am index 82a98305..bccb8aae 100644 --- a/modules/pam_wheel/Makefile.am +++ b/modules/pam_wheel/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README ${MANS} $(XMLS) tst-pam_wheel @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_wheel.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_xauth/Makefile.am b/modules/pam_xauth/Makefile.am index 8f1d56b0..816d50e9 100644 --- a/modules/pam_xauth/Makefile.am +++ b/modules/pam_xauth/Makefile.am @@ -1,8 +1,9 @@ # -# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de> +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk <kukuk@suse.de> # CLEANFILES = *~ +MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README ${MANS} $(XMLS) tst-pam_xauth @@ -28,4 +29,3 @@ noinst_DATA = README README: pam_xauth.8.xml -include $(top_srcdir)/Make.xml.rules endif - |