From a92c17bccef85519917b91e4c181154559ecec96 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Fri, 26 Jun 2009 09:55:25 +0000 Subject: Relevant BUGIDs: Purpose of commit: bugfix Commit summary: --------------- Fix blowfish support 009-06-25 Thorsten Kukuk * configure.in: Rename crypt_gensalt_rn to crypt_gensalt_r * modules/pam_unix/passverify.c: Likewise. --- modules/pam_unix/passverify.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'modules/pam_unix') diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c index 8cf95c33..489e8560 100644 --- a/modules/pam_unix/passverify.c +++ b/modules/pam_unix/passverify.c @@ -274,7 +274,7 @@ PAMH_ARG_DECL(int check_shadow_expiry, } if ((curdays - spent->sp_lstchg < spent->sp_min) && (spent->sp_min != -1)) { - /* + /* * The last password change was too recent. This error will be ignored * if no password change is attempted. */ @@ -403,11 +403,11 @@ PAMH_ARG_DECL(char * create_password_hash, return crypted; } -#ifdef HAVE_CRYPT_GENSALT_RN +#ifdef HAVE_CRYPT_GENSALT_R if (on(UNIX_BLOWFISH_PASS, ctrl)) { char entropy[17]; crypt_make_salt(entropy, sizeof(entropy) - 1); - sp = crypt_gensalt_rn(algoid, rounds, + sp = crypt_gensalt_r (algoid, rounds, entropy, sizeof(entropy), salt, sizeof(salt)); } else { @@ -420,7 +420,7 @@ PAMH_ARG_DECL(char * create_password_hash, /* For now be conservative so the resulting hashes * are not too long. 8 bytes of salt prevents dictionary * attacks well enough. */ -#ifdef HAVE_CRYPT_GENSALT_RN +#ifdef HAVE_CRYPT_GENSALT_R } #endif sp = crypt(password, salt); @@ -684,7 +684,7 @@ save_old_password(pam_handle_t *pamh, const char *forwho, const char *oldpass, D(("fflush or fsync error writing entries to old passwords file: %m")); err = 1; } - + if (fclose(pwfile)) { D(("fclose error writing entries to old passwords file: %m")); err = 1; @@ -804,7 +804,7 @@ PAMH_ARG_DECL(int unix_update_passwd, D(("fflush or fsync error writing entries to password file: %m")); err = 1; } - + if (fclose(pwfile)) { D(("fclose error writing entries to password file: %m")); err = 1; @@ -930,7 +930,7 @@ PAMH_ARG_DECL(int unix_update_shadow, D(("fflush or fsync error writing entries to shadow file: %m")); err = 1; } - + if (fclose(pwfile)) { D(("fclose error writing entries to shadow file: %m")); err = 1; -- cgit v1.2.3 From a10774c48223737de31a941f9de53f250db232fc Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Fri, 26 Jun 2009 12:23:28 +0000 Subject: Relevant BUGIDs: Purpose of commit: cleanup Commit summary: --------------- 2009-06-26 Thorsten Kukuk * modules/pam_unix/pam_unix_passwd.c: Remove dead SELinux code. --- ChangeLog | 3 +++ modules/pam_unix/pam_unix_passwd.c | 11 +++-------- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'modules/pam_unix') diff --git a/ChangeLog b/ChangeLog index d99006f1..9c86cdf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-06-26 Thorsten Kukuk + * modules/pam_unix/pam_unix_passwd.c: Remove dead SELinux + code. + * modules/pam_lastlog/pam_lastlog.c (last_login_failed): Fix usage of wrong variable [bug#2809661]. diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index 30ea6687..29b9c67d 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -1,7 +1,7 @@ /* * Main coding by Elliot Lee , Red Hat Software. * Copyright (C) 1996. - * Copyright (c) Jan Rękorajski, 1999. + * Copyright (c) Jan RĂŞkorajski, 1999. * Copyright (c) Red Hat, Inc., 2007, 2008. * * Redistribution and use in source and binary forms, with or without @@ -61,11 +61,6 @@ #include #include #include -#ifdef WITH_SELINUX -static int selinux_enabled=-1; -#include -#define SELINUX_ENABLED (selinux_enabled!=-1 ? selinux_enabled : (selinux_enabled=is_selinux_enabled()>0)) -#endif #include @@ -196,7 +191,7 @@ static int _unix_run_update_binary(pam_handle_t *pamh, unsigned int ctrl, const snprintf(buffer, sizeof(buffer), "%d", remember); args[4] = x_strdup(buffer); - + execve(UPDATE_HELPER, args, envp); /* should not get here: exit with error */ @@ -698,7 +693,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t * pamh, int flags, pass_new = NULL; } retval = _pam_unix_approve_pass(pamh, ctrl, pass_old, pass_new); - + if (retval != PAM_SUCCESS && off(UNIX_NOT_SET_PASS, ctrl)) { pam_set_item(pamh, PAM_AUTHTOK, NULL); } -- cgit v1.2.3 From dbfe0f0ef9417fa939490a220f013f68e7f76f52 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Sun, 28 Jun 2009 09:27:00 +0000 Subject: Relevant BUGIDs: Purpose of commit: bugfix Commit summary: --------------- 2009-06-26 Thorsten Kukuk * 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. --- ChangeLog | 50 ++++++++++++++++++++++++++++++++++++++ configure.in | 14 ++++++----- modules/pam_access/Makefile.am | 3 ++- modules/pam_cracklib/Makefile.am | 25 +++++++++---------- modules/pam_debug/Makefile.am | 4 +-- modules/pam_deny/Makefile.am | 3 ++- modules/pam_echo/Makefile.am | 3 ++- modules/pam_env/Makefile.am | 3 ++- modules/pam_env/pam_env.c | 2 +- modules/pam_exec/Makefile.am | 3 ++- modules/pam_faildelay/Makefile.am | 4 +-- modules/pam_filter/Makefile.am | 4 +-- modules/pam_ftp/Makefile.am | 4 +-- modules/pam_group/Makefile.am | 4 +-- modules/pam_issue/Makefile.am | 4 +-- modules/pam_keyinit/Makefile.am | 3 ++- modules/pam_lastlog/Makefile.am | 4 +-- modules/pam_limits/Makefile.am | 3 ++- modules/pam_listfile/Makefile.am | 4 +-- modules/pam_localuser/Makefile.am | 6 ++--- modules/pam_loginuid/Makefile.am | 3 ++- modules/pam_mail/Makefile.am | 4 +-- modules/pam_mkhomedir/Makefile.am | 4 +-- modules/pam_motd/Makefile.am | 4 +-- modules/pam_namespace/Makefile.am | 37 ++++++++++++++++------------ modules/pam_nologin/Makefile.am | 4 +-- modules/pam_permit/Makefile.am | 4 +-- modules/pam_pwhistory/Makefile.am | 4 +-- modules/pam_rhosts/Makefile.am | 4 +-- modules/pam_rootok/Makefile.am | 3 ++- modules/pam_securetty/Makefile.am | 3 ++- modules/pam_shells/Makefile.am | 4 +-- modules/pam_stress/Makefile.am | 2 +- modules/pam_succeed_if/Makefile.am | 3 ++- modules/pam_tally/Makefile.am | 3 ++- modules/pam_tally2/Makefile.am | 3 ++- modules/pam_time/Makefile.am | 3 ++- modules/pam_timestamp/Makefile.am | 5 ++-- modules/pam_tty_audit/Makefile.am | 4 +-- modules/pam_umask/Makefile.am | 4 +-- modules/pam_unix/Makefile.am | 10 ++++---- modules/pam_userdb/Makefile.am | 14 +++++++---- modules/pam_warn/Makefile.am | 4 +-- modules/pam_wheel/Makefile.am | 4 +-- modules/pam_xauth/Makefile.am | 4 +-- 45 files changed, 183 insertions(+), 108 deletions(-) (limited to 'modules/pam_unix') diff --git a/ChangeLog b/ChangeLog index 9c86cdf2..8b82adbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,55 @@ 2009-06-26 Thorsten Kukuk + * 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2007, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2006, 2009 David Howells # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2008, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2008, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2007, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2007, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 +# Copyright (c) 2005, 2006, 2009 Thorsten Kukuk # 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 - -- cgit v1.2.3 From 006cf0e7333c53f7981c60c1cfcad77537d0fe74 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Mon, 29 Jun 2009 08:15:00 +0000 Subject: Relevant BUGIDs: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Purpose of commit: docu fix Commit summary: --------------- 2009-06-29 Thorsten Kukuk * modules/pam_unix/pam_unix.8.xml: Fix blowfish description. Reported by Diego E. “Flameeyes” Pettenò. --- modules/pam_unix/pam_unix.8.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/pam_unix') diff --git a/modules/pam_unix/pam_unix.8.xml b/modules/pam_unix/pam_unix.8.xml index a726e5e7..6b860f7f 100644 --- a/modules/pam_unix/pam_unix.8.xml +++ b/modules/pam_unix/pam_unix.8.xml @@ -296,7 +296,7 @@ When a user changes their password next, encrypt it with the blowfish algorithm. If the - SHA512 algorithm is not known to the + blowfish algorithm is not known to the crypt3 function, fall back to MD5. -- cgit v1.2.3 From 2037cd51a2b787c492d60c9235b85868f03ed9ba Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Tue, 30 Jun 2009 10:28:53 +0000 Subject: Relevant BUGIDs: Purpose of commit: bugfix Commit summary: --------------- This makes Linux-PAM compile able with uClibc or on embedded systems without full libc/libnsl. 2009-06-29 Thorsten Kukuk * modules/pam_unix/yppasswd_xdr.c: Remove unnecessary header files. * modules/pam_unix/support.c (_unix_getpwnam): Only compile in NIS support if all necessary functions exist. * modules/pam_unix/pam_unix_passwd.c (getNISserver): Add debug option, handle correct if OS has no NIS support. * modules/pam_access/pam_access.c (netgroup_match): Check if yp_get_default_domain and innetgr are available at compile time. * configure.in: Check for functions: innetgr, getdomainname check for headers: rpcsvc/ypclnt.h, rpcsvc/yp_prot.h. --- ChangeLog | 21 +++++++++++++++++++++ configure.in | 4 ++-- modules/pam_access/pam_access.c | 26 ++++++++++++++++++++++---- modules/pam_unix/pam_unix_passwd.c | 36 ++++++++++++++++++++++++++++++++++-- modules/pam_unix/support.c | 7 +++++++ modules/pam_unix/yppasswd_xdr.c | 2 -- 6 files changed, 86 insertions(+), 10 deletions(-) (limited to 'modules/pam_unix') diff --git a/ChangeLog b/ChangeLog index 8b82adbb..9ee58687 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2009-06-29 Thorsten Kukuk + + * modules/pam_unix/yppasswd_xdr.c: Remove unnecessary header files. + + * modules/pam_unix/support.c (_unix_getpwnam): Only compile in NIS + support if all necessary functions exist. + + * modules/pam_unix/pam_unix_passwd.c (getNISserver): Add debug + option, handle correct if OS has no NIS support. + + * modules/pam_access/pam_access.c (netgroup_match): Check if + yp_get_default_domain and innetgr are available at compile time. + + * configure.in: Check for functions: innetgr, getdomainname + check for headers: rpcsvc/ypclnt.h, rpcsvc/yp_prot.h. + +2009-06-29 Thorsten Kukuk + + * modules/pam_unix/pam_unix.8.xml: Fix blowfish description. + Reported by Diego E. “Flameeyes” Pettenò. + 2009-06-26 Thorsten Kukuk * modules/pam_namespace/Makefile.am: Fix make maintainer-clean, diff --git a/configure.in b/configure.in index b7d88003..3cc05ed4 100644 --- a/configure.in +++ b/configure.in @@ -409,7 +409,7 @@ AM_CONDITIONAL([HAVE_LIBDB], [test ! -z "$LIBDB"]) AC_CHECK_LIB([nsl],[yp_get_default_domain], LIBNSL="-lnsl", LIBNSL="") BACKUP_LIBS=$LIBS LIBS="$LIBS $LIBNSL" -AC_CHECK_FUNCS(yp_get_default_domain) +AC_CHECK_FUNCS(yp_get_default_domain getdomainname innetgr yperr_string yp_master yp_bind yp_match yp_unbind) LIBS=$BACKUP_LIBS AC_SUBST(LIBNSL) @@ -436,7 +436,7 @@ dnl Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h net/if.h termio.h unistd.h sys/fsuid.h inittypes.h) +AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h net/if.h termio.h unistd.h sys/fsuid.h inittypes.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h) dnl For module/pam_lastlog AC_CHECK_HEADERS(lastlog.h utmp.h utmpx.h) diff --git a/modules/pam_access/pam_access.c b/modules/pam_access/pam_access.c index ba8effe3..963ce528 100644 --- a/modules/pam_access/pam_access.c +++ b/modules/pam_access/pam_access.c @@ -41,11 +41,12 @@ #include #include #include -#include #include #include #include - +#ifdef HAVE_RPCSVC_YPCLNT_H +#include +#endif #ifdef HAVE_LIBAUDIT #include #endif @@ -465,13 +466,31 @@ static int netgroup_match (pam_handle_t *pamh, const char *netgroup, const char *machine, const char *user, int debug) { - char *mydomain = NULL; int retval; + char *mydomain = NULL; +#ifdef HAVE_YP_GET_DEFAUTL_DOMAIN yp_get_default_domain(&mydomain); +#elif defined(HAVE_GETDOMAINNAME) + char domainname_res[256]; + if (getdomainname (domainname_res, sizeof (domainname_res)) == 0) + { + if (strcmp (domainname_res, "(none)") == 0) + { + /* If domainname is not set, some systems will return "(none)" */ + domainname_res[0] = '\0'; + } + mydomain = domainname_res; + } +#endif +#ifdef HAVE_INNETGR retval = innetgr (netgroup, machine, user, mydomain); +#else + retval = 0; + pam_syslog (pamh, LOG_ERR, "pam_access does not have netgroup support"); +#endif if (debug == YES) pam_syslog (pamh, LOG_DEBUG, "netgroup_match: %d (netgroup=%s, machine=%s, user=%s, domain=%s)", @@ -479,7 +498,6 @@ netgroup_match (pam_handle_t *pamh, const char *netgroup, machine ? machine : "NULL", user ? user : "NULL", mydomain ? mydomain : "NULL"); return retval; - } /* user_match - match a username against one token */ diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index 29b9c67d..2792a4d5 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -55,8 +55,12 @@ #include #include #include +#ifdef HAVE_RPCSVC_YP_PROT_H #include +#endif +#ifdef HAVE_RPCSVC_YPCLNT_H #include +#endif #include #include @@ -98,17 +102,34 @@ extern int getrpcport(const char *host, unsigned long prognum, #define MAX_PASSWD_TRIES 3 -static char *getNISserver(pam_handle_t *pamh) +static char *getNISserver(pam_handle_t *pamh, unsigned int ctrl) { +#if (defined(HAVE_YP_GET_DEFAULT_DOMAIN) || defined(HAVE_GETDOMAINNAME)) && defined(HAVE_YP_MASTER) char *master; char *domainname; int port, err; +#ifdef HAVE_YP_GET_DEFAULT_DOMAIN if ((err = yp_get_default_domain(&domainname)) != 0) { pam_syslog(pamh, LOG_WARNING, "can't get local yp domain: %s", yperr_string(err)); return NULL; } +#elif defined(HAVE_GETDOMAINNAME) + char domainname_res[256]; + + if (getdomainname (domainname_res, sizeof (domainname_res)) == 0) + { + if (strcmp (domainname_res, "(none)") == 0) + { + /* If domainname is not set, some systems will return "(none)" */ + domainname_res[0] = '\0'; + } + domainname = domainname_res; + } + else domainname = NULL; +#endif + if ((err = yp_master(domainname, "passwd.byname", &master)) != 0) { pam_syslog(pamh, LOG_WARNING, "can't find the master ypserver: %s", yperr_string(err)); @@ -125,7 +146,18 @@ static char *getNISserver(pam_handle_t *pamh) "yppasswd daemon running on illegal port"); return NULL; } + if (on(UNIX_DEBUG, ctrl)) { + pam_syslog(pamh, LOG_DEBUG, "Use NIS server on %s with port %d", + master, port); + } return master; +#else + if (on(UNIX_DEBUG, ctrl)) { + pam_syslog(pamh, LOG_DEBUG, "getNISserver: No NIS support available"); + } + + return NULL; +#endif } #ifdef WITH_SELINUX @@ -294,7 +326,7 @@ static int _do_setpass(pam_handle_t* pamh, const char *forwho, } if (on(UNIX_NIS, ctrl) && _unix_comesfromsource(pamh, forwho, 0, 1)) { - if ((master=getNISserver(pamh)) != NULL) { + if ((master=getNISserver(pamh, ctrl)) != NULL) { struct timeval timeout; struct yppasswd yppwd; CLIENT *clnt; diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c index 050e0dc1..2a47d157 100644 --- a/modules/pam_unix/support.c +++ b/modules/pam_unix/support.c @@ -19,7 +19,9 @@ #include #include #include +#ifdef HAVE_RPCSVC_YPCLNT_H #include +#endif #include #include @@ -275,6 +277,7 @@ int _unix_getpwnam(pam_handle_t *pamh, const char *name, } } +#if defined(HAVE_YP_GET_DEFAULT_DOMAIN) && defined (HAVE_YP_BIND) && defined (HAVE_YP_MATCH) && defined (HAVE_YP_UNBIND) if (!matched && nis) { char *userinfo = NULL, *domain = NULL; int len = 0, i; @@ -293,6 +296,10 @@ int _unix_getpwnam(pam_handle_t *pamh, const char *name, } } } +#else + /* we don't have NIS support, make compiler happy. */ + nis = 0; +#endif if (matched && (ret != NULL)) { *ret = NULL; diff --git a/modules/pam_unix/yppasswd_xdr.c b/modules/pam_unix/yppasswd_xdr.c index 0b7cfac6..0b95b82b 100644 --- a/modules/pam_unix/yppasswd_xdr.c +++ b/modules/pam_unix/yppasswd_xdr.c @@ -13,8 +13,6 @@ #include "config.h" #include -#include -#include #include "yppasswd.h" bool_t -- cgit v1.2.3 From 17c4c04115c7de3f5884ebdc562b0912bbd1b736 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 8 Dec 2009 09:15:51 +0000 Subject: Relevant BUGIDs: rhbz#545053 Purpose of commit: new feature Commit summary: --------------- 2009-12-08 Tomas Mraz * modules/pam_unix/passverify.c(unix_update_shadow): Create a shadow entry if not present in the file. --- ChangeLog | 3 +++ modules/pam_unix/passverify.c | 25 ++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) (limited to 'modules/pam_unix') diff --git a/ChangeLog b/ChangeLog index eeed6fb0..547b2d58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-12-08 Tomas Mraz + * modules/pam_unix/passverify.c(unix_update_shadow): Create a shadow + entry if not present in the file. + * modules/pam_listfile/pam_listfile.c(pam_sm_authenticate): Remove unused function and variable. diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c index 489e8560..d175dfa5 100644 --- a/modules/pam_unix/passverify.c +++ b/modules/pam_unix/passverify.c @@ -839,19 +839,16 @@ done: PAMH_ARG_DECL(int unix_update_shadow, const char *forwho, char *towhat) { - struct spwd *spwdent = NULL, *stmpent = NULL; + struct spwd spwdent, *stmpent = NULL; struct stat st; FILE *pwfile, *opwfile; - int err = 1; + int err = 0; int oldmask; + int wroteentry = 0; #ifdef WITH_SELINUX security_context_t prev_context=NULL; #endif - spwdent = getspnam(forwho); - if (spwdent == NULL) { - return PAM_USER_UNKNOWN; - } oldmask = umask(077); #ifdef WITH_SELINUX @@ -912,7 +909,7 @@ PAMH_ARG_DECL(int unix_update_shadow, if (!strcmp(stmpent->sp_namp, forwho)) { stmpent->sp_pwdp = towhat; stmpent->sp_lstchg = time(NULL) / (60 * 60 * 24); - err = 0; + wroteentry = 1; D(("Set password %s for %s", stmpent->sp_pwdp, forwho)); } @@ -924,8 +921,22 @@ PAMH_ARG_DECL(int unix_update_shadow, stmpent = fgetspent(opwfile); } + fclose(opwfile); + if (!wroteentry && !err) { + spwdent.sp_namp = forwho; + spwdent.sp_pwdp = towhat; + spwdent.sp_lstchg = time(NULL) / (60 * 60 * 24); + spwdent.sp_min = spwdent.sp_max = spwdent.sp_warn = spwdent.sp_inact = + spwdent.sp_expire = -1; + spwdent.sp_flag = (unsigned long)-1l; + if (putspent(&spwdent, pwfile)) { + D(("error writing entry to shadow file: %m")); + err = 1; + } + } + if (fflush(pwfile) || fsync(fileno(pwfile))) { D(("fflush or fsync error writing entries to shadow file: %m")); err = 1; -- cgit v1.2.3 From a728c0f63e15c18ef599e599e4e46456b624abda Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Tue, 8 Dec 2009 14:41:40 +0000 Subject: Relevant BUGIDs: 2892529 Purpose of commit: bugfix Commit summary: --------------- 2009-12-08 Thorsten Kukuk * configure.in: Rename DEBUG to PAM_DEBUG. * libpam/pam_env.c: Likewise * libpam/pam_handlers.c: Likewise * libpam/pam_miscc.c: Likewise * libpam/pam_password.c: Likewise * libpam/include/security/_pam_macros.h: Likewise * libpamc/test/modules/pam_secret.c: Likewise * modules/pam_group/pam_group.c: Likewise * modules/pam_listfile/pam_listfile.c: Likewise * modules/pam_unix/pam_unix_auth.c: Likewise * modules/pam_unix/pam_unix_passwd.c: Likewise --- ChangeLog | 14 ++++++++++++++ configure.in | 2 +- libpam/include/security/_pam_macros.h | 4 ++-- libpam/pam_env.c | 2 +- libpam/pam_handlers.c | 2 +- libpam/pam_misc.c | 2 +- libpam/pam_password.c | 2 -- libpamc/test/modules/pam_secret.c | 4 +--- modules/pam_group/pam_group.c | 6 +++--- modules/pam_listfile/pam_listfile.c | 18 +++++++++--------- modules/pam_unix/pam_unix_auth.c | 2 -- modules/pam_unix/pam_unix_passwd.c | 2 +- 12 files changed, 34 insertions(+), 26 deletions(-) (limited to 'modules/pam_unix') diff --git a/ChangeLog b/ChangeLog index 547b2d58..80e00631 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2009-12-08 Thorsten Kukuk + + * configure.in: Rename DEBUG to PAM_DEBUG. + * libpam/pam_env.c: Likewise + * libpam/pam_handlers.c: Likewise + * libpam/pam_miscc.c: Likewise + * libpam/pam_password.c: Likewise + * libpam/include/security/_pam_macros.h: Likewise + * libpamc/test/modules/pam_secret.c: Likewise + * modules/pam_group/pam_group.c: Likewise + * modules/pam_listfile/pam_listfile.c: Likewise + * modules/pam_unix/pam_unix_auth.c: Likewise + * modules/pam_unix/pam_unix_passwd.c: Likewise + 2009-12-08 Tomas Mraz * modules/pam_unix/passverify.c(unix_update_shadow): Create a shadow diff --git a/configure.in b/configure.in index 3cc05ed4..96cf572b 100644 --- a/configure.in +++ b/configure.in @@ -234,7 +234,7 @@ AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug],[specify you are building with debugging on])) if test x"$enable_debug" = x"yes" ; then - AC_DEFINE([DEBUG],, + AC_DEFINE([PAM_DEBUG],, [lots of stuff gets written to /var/run/pam-debug.log]) fi diff --git a/libpam/include/security/_pam_macros.h b/libpam/include/security/_pam_macros.h index bd107cfb..e891e226 100644 --- a/libpam/include/security/_pam_macros.h +++ b/libpam/include/security/_pam_macros.h @@ -62,7 +62,7 @@ do { \ /* some debugging code */ -#ifdef DEBUG +#ifdef PAM_DEBUG /* * This provides the necessary function to do debugging in PAM. @@ -191,6 +191,6 @@ do { \ #define _pam_show_mem(X,XS) do { } while (0) #define _pam_show_reply(reply, replies) do { } while (0) -#endif /* DEBUG */ +#endif /* PAM_DEBUG */ #endif /* PAM_MACROS_H */ diff --git a/libpam/pam_env.c b/libpam/pam_env.c index dcdac7ab..1c8403d6 100644 --- a/libpam/pam_env.c +++ b/libpam/pam_env.c @@ -21,7 +21,7 @@ /* helper functions */ -#ifdef DEBUG +#ifdef PAM_DEBUG static void _pam_dump_env(pam_handle_t *pamh) { int i; diff --git a/libpam/pam_handlers.c b/libpam/pam_handlers.c index bca3dd31..59a1929f 100644 --- a/libpam/pam_handlers.c +++ b/libpam/pam_handlers.c @@ -239,7 +239,7 @@ static int _pam_parse_conf_file(pam_handle_t *pamh, FILE *f argv = NULL; } -#ifdef DEBUG +#ifdef PAM_DEBUG { int y; diff --git a/libpam/pam_misc.c b/libpam/pam_misc.c index b690fd3e..0e607276 100644 --- a/libpam/pam_misc.c +++ b/libpam/pam_misc.c @@ -171,7 +171,7 @@ int _pam_mkargv(char *s, char ***argv, int *argc) char **our_argv = NULL; char **argvbuf; char *argvbufp; -#ifdef DEBUG +#ifdef PAM_DEBUG int count=0; #endif diff --git a/libpam/pam_password.c b/libpam/pam_password.c index 70917c58..75db5e50 100644 --- a/libpam/pam_password.c +++ b/libpam/pam_password.c @@ -4,8 +4,6 @@ * $Id$ */ -/* #define DEBUG */ - #include "pam_private.h" #include diff --git a/libpamc/test/modules/pam_secret.c b/libpamc/test/modules/pam_secret.c index 830f1a78..6316f7f5 100644 --- a/libpamc/test/modules/pam_secret.c +++ b/libpamc/test/modules/pam_secret.c @@ -9,8 +9,6 @@ * NEEDS TO BE INTEGRATED MORE NATIVELY. */ -/* #define DEBUG */ - #include #include #include @@ -178,7 +176,7 @@ static int converse(pam_handle_t *pamh, struct ps_state_s *new) } } -#ifdef DEBUG +#ifdef PAM_DEBUG if (retval == PAM_SUCCESS) { D(("reply has length=%d and control=%u", PAM_BP_LENGTH(new->current_reply), diff --git a/modules/pam_group/pam_group.c b/modules/pam_group/pam_group.c index 4a931c4f..3dc7f78e 100644 --- a/modules/pam_group/pam_group.c +++ b/modules/pam_group/pam_group.c @@ -605,7 +605,7 @@ static int check_account(pam_handle_t *pamh, const char *service, no_grps = 0; _pam_drop(grps); } -#ifdef DEBUG +#ifdef PAM_DEBUG { int z; for (z=0; z 0) { -#ifdef DEBUG +#ifdef PAM_DEBUG int err; #endif D(("trying to set %d groups", no_grps)); -#ifdef DEBUG +#ifdef PAM_DEBUG for (err=0; err #include -#ifdef DEBUG +#ifdef PAM_DEBUG #include #endif @@ -199,23 +199,23 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, if(apply_type==APPLY_TYPE_USER) { if(strcmp(user_name, apply_val)) { /* Does not apply to this user */ -#ifdef DEBUG +#ifdef PAM_DEBUG pam_syslog(pamh,LOG_DEBUG, "don't apply: apply=%s, user=%s", apply_val,user_name); -#endif /* DEBUG */ +#endif /* PAM_DEBUG */ free(ifname); return PAM_IGNORE; } } else if(apply_type==APPLY_TYPE_GROUP) { if(!pam_modutil_user_in_group_nam_nam(pamh,user_name,apply_val)) { /* Not a member of apply= group */ -#ifdef DEBUG +#ifdef PAM_DEBUG pam_syslog(pamh,LOG_DEBUG, "don't apply: %s not a member of group %s", user_name,apply_val); -#endif /* DEBUG */ +#endif /* PAM_DEBUG */ free(ifname); return PAM_IGNORE; } @@ -276,7 +276,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, return onerr; } } -#ifdef DEBUG +#ifdef PAM_DEBUG pam_syslog(pamh,LOG_INFO, "Got file = %s, item = %d, value = %s, sense = %d", @@ -312,7 +312,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, retval=PAM_AUTH_ERR; /* This loop assumes that PAM_SUCCESS == 0 and PAM_AUTH_ERR != 0 */ -#ifdef DEBUG +#ifdef PAM_DEBUG assert(PAM_SUCCESS == 0); assert(PAM_AUTH_ERR != 0); #endif @@ -343,7 +343,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, fclose(inf); free(ifname); if ((sense && retval) || (!sense && !retval)) { -#ifdef DEBUG +#ifdef PAM_DEBUG pam_syslog(pamh,LOG_INFO, "Returning PAM_SUCCESS, retval = %d", retval); #endif @@ -352,7 +352,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, else { const void *service; const char *user_name; -#ifdef DEBUG +#ifdef PAM_DEBUG pam_syslog(pamh,LOG_INFO, "Returning PAM_AUTH_ERR, retval = %d", retval); #endif diff --git a/modules/pam_unix/pam_unix_auth.c b/modules/pam_unix/pam_unix_auth.c index 05b5ec6c..c2f79b10 100644 --- a/modules/pam_unix/pam_unix_auth.c +++ b/modules/pam_unix/pam_unix_auth.c @@ -35,8 +35,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* #define DEBUG */ - #include "config.h" #include diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index 2792a4d5..1d70a7c2 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -385,7 +385,7 @@ static int _do_setpass(pam_handle_t* pamh, const char *forwho, _("NIS password could not be changed.")); retval = PAM_TRY_AGAIN; } -#ifdef DEBUG +#ifdef PAM_DEBUG sleep(5); #endif } else { -- cgit v1.2.3