From owner-svn-src-all@freebsd.org Wed Jun 8 11:47:20 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EFD39B6FC07; Wed, 8 Jun 2016 11:47:20 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CAC081F5F; Wed, 8 Jun 2016 11:47:20 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u58BlKrg099467; Wed, 8 Jun 2016 11:47:20 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u58BlJ8X099462; Wed, 8 Jun 2016 11:47:19 GMT (envelope-from des@FreeBSD.org) Message-Id: <201606081147.u58BlJ8X099462@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Wed, 8 Jun 2016 11:47:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r301602 - in head: . lib/libpam lib/libpam/libpam lib/libpam/libpam/security tools/build/mk 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.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jun 2016 11:47:21 -0000 Author: des Date: Wed Jun 8 11:47:19 2016 New Revision: 301602 URL: https://svnweb.freebsd.org/changeset/base/301602 Log: Replace _pam_verbose_error() with a macro. This was the last difference between our libpam and stock OpenPAM, meaning that it is now possible to replace the base libpam with a hypothetical ports version of OpenPAM. Deleted: head/lib/libpam/libpam/pam_debug_log.c Modified: head/ObsoleteFiles.inc head/lib/libpam/Makefile.inc head/lib/libpam/libpam/Makefile head/lib/libpam/libpam/security/pam_mod_misc.h head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Wed Jun 8 11:24:01 2016 (r301601) +++ head/ObsoleteFiles.inc Wed Jun 8 11:47:19 2016 (r301602) @@ -38,6 +38,57 @@ # xargs -n1 | sort | uniq -d; # done +# 20160608: removed pam_verbose_error +OLD_LIBS+=usr/lib/libpam.so.5 +OLD_LIBS+=usr/lib/pam_chroot.so.5 +OLD_LIBS+=usr/lib/pam_deny.so.5 +OLD_LIBS+=usr/lib/pam_echo.so.5 +OLD_LIBS+=usr/lib/pam_exec.so.5 +OLD_LIBS+=usr/lib/pam_ftpusers.so.5 +OLD_LIBS+=usr/lib/pam_group.so.5 +OLD_LIBS+=usr/lib/pam_guest.so.5 +OLD_LIBS+=usr/lib/pam_krb5.so.5 +OLD_LIBS+=usr/lib/pam_ksu.so.5 +OLD_LIBS+=usr/lib/pam_lastlog.so.5 +OLD_LIBS+=usr/lib/pam_login_access.so.5 +OLD_LIBS+=usr/lib/pam_nologin.so.5 +OLD_LIBS+=usr/lib/pam_opie.so.5 +OLD_LIBS+=usr/lib/pam_opieaccess.so.5 +OLD_LIBS+=usr/lib/pam_passwdqc.so.5 +OLD_LIBS+=usr/lib/pam_permit.so.5 +OLD_LIBS+=usr/lib/pam_radius.so.5 +OLD_LIBS+=usr/lib/pam_rhosts.so.5 +OLD_LIBS+=usr/lib/pam_rootok.so.5 +OLD_LIBS+=usr/lib/pam_securetty.so.5 +OLD_LIBS+=usr/lib/pam_self.so.5 +OLD_LIBS+=usr/lib/pam_ssh.so.5 +OLD_LIBS+=usr/lib/pam_tacplus.so.5 +OLD_LIBS+=usr/lib/pam_unix.so.5 +OLD_LIBS+=usr/lib32/libpam.so.5 +OLD_LIBS+=usr/lib32/pam_chroot.so.5 +OLD_LIBS+=usr/lib32/pam_deny.so.5 +OLD_LIBS+=usr/lib32/pam_echo.so.5 +OLD_LIBS+=usr/lib32/pam_exec.so.5 +OLD_LIBS+=usr/lib32/pam_ftpusers.so.5 +OLD_LIBS+=usr/lib32/pam_group.so.5 +OLD_LIBS+=usr/lib32/pam_guest.so.5 +OLD_LIBS+=usr/lib32/pam_krb5.so.5 +OLD_LIBS+=usr/lib32/pam_ksu.so.5 +OLD_LIBS+=usr/lib32/pam_lastlog.so.5 +OLD_LIBS+=usr/lib32/pam_login_access.so.5 +OLD_LIBS+=usr/lib32/pam_nologin.so.5 +OLD_LIBS+=usr/lib32/pam_opie.so.5 +OLD_LIBS+=usr/lib32/pam_opieaccess.so.5 +OLD_LIBS+=usr/lib32/pam_passwdqc.so.5 +OLD_LIBS+=usr/lib32/pam_permit.so.5 +OLD_LIBS+=usr/lib32/pam_radius.so.5 +OLD_LIBS+=usr/lib32/pam_rhosts.so.5 +OLD_LIBS+=usr/lib32/pam_rootok.so.5 +OLD_LIBS+=usr/lib32/pam_securetty.so.5 +OLD_LIBS+=usr/lib32/pam_self.so.5 +OLD_LIBS+=usr/lib32/pam_ssh.so.5 +OLD_LIBS+=usr/lib32/pam_tacplus.so.5 +OLD_LIBS+=usr/lib32/pam_unix.so.5 # 20160523: remove extranous ALTQ files OLD_FILES+=usr/include/altq/altq_codel.h OLD_FILES+=usr/include/altq/altq_fairq.h Modified: head/lib/libpam/Makefile.inc ============================================================================== --- head/lib/libpam/Makefile.inc Wed Jun 8 11:24:01 2016 (r301601) +++ head/lib/libpam/Makefile.inc Wed Jun 8 11:47:19 2016 (r301602) @@ -26,7 +26,7 @@ CFLAGS+= -DOPENPAM_DEBUG -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 6 STATIC_CFLAGS+= -DOPENPAM_STATIC_MODULES Modified: head/lib/libpam/libpam/Makefile ============================================================================== --- head/lib/libpam/libpam/Makefile Wed Jun 8 11:24:01 2016 (r301601) +++ head/lib/libpam/libpam/Makefile Wed Jun 8 11:47:19 2016 (r301602) @@ -100,8 +100,6 @@ SRCS= openpam_asprintf.c \ pam_verror.c \ pam_vinfo.c \ pam_vprompt.c -# Local additions -SRCS+= pam_debug_log.c MAN?= openpam.3 \ openpam_borrow_cred.3 \ Modified: head/lib/libpam/libpam/security/pam_mod_misc.h ============================================================================== --- head/lib/libpam/libpam/security/pam_mod_misc.h Wed Jun 8 11:24:01 2016 (r301601) +++ head/lib/libpam/libpam/security/pam_mod_misc.h Wed Jun 8 11:47:19 2016 (r301602) @@ -39,18 +39,17 @@ #define PAM_OPT_ECHO_PASS "echo_pass" #define PAM_OPT_DEBUG "debug" -__BEGIN_DECLS -void _pam_verbose_error(pam_handle_t *, int, const char *, - const char *, const char *, ...); -__END_DECLS - -#define PAM_LOG(...) \ +#define PAM_LOG(...) \ openpam_log(PAM_LOG_DEBUG, __VA_ARGS__) -#define PAM_RETURN(arg) \ +#define PAM_RETURN(arg) \ return (arg) -#define PAM_VERBOSE_ERROR(...) \ - _pam_verbose_error(pamh, flags, __FILE__, __func__, __VA_ARGS__) +#define PAM_VERBOSE_ERROR(...) \ + do { \ + if (!(flags & PAM_SILENT) && \ + !openpam_get_option(pamh, "no_warn")) \ + pam_error(pamh, __VA_ARGS__); \ + } while (0); #endif Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Wed Jun 8 11:24:01 2016 (r301601) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Wed Jun 8 11:47:19 2016 (r301602) @@ -3209,9 +3209,9 @@ OLD_FILES+=usr/lib/libwind.so OLD_LIBS+=usr/lib/libwind.so.11 OLD_FILES+=usr/lib/libwind_p.a OLD_FILES+=usr/lib/pam_krb5.so -OLD_LIBS+=usr/lib/pam_krb5.so.5 +OLD_LIBS+=usr/lib/pam_krb5.so.6 OLD_FILES+=usr/lib/pam_ksu.so -OLD_LIBS+=usr/lib/pam_ksu.so.5 +OLD_LIBS+=usr/lib/pam_ksu.so.6 OLD_FILES+=usr/lib/private/libheimipcc.a OLD_FILES+=usr/lib/private/libheimipcc.so OLD_LIBS+=usr/lib/private/libheimipcc.so.11 @@ -3286,9 +3286,9 @@ OLD_FILES+=usr/lib32/libwind.so OLD_LIBS+=usr/lib32/libwind.so.11 OLD_FILES+=usr/lib32/libwind_p.a OLD_FILES+=usr/lib32/pam_krb5.so -OLD_LIBS+=usr/lib32/pam_krb5.so.5 +OLD_LIBS+=usr/lib32/pam_krb5.so.6 OLD_FILES+=usr/lib32/pam_ksu.so -OLD_LIBS+=usr/lib32/pam_ksu.so.5 +OLD_LIBS+=usr/lib32/pam_ksu.so.6 OLD_FILES+=usr/lib32/private/libheimipcc.a OLD_FILES+=usr/lib32/private/libheimipcc.so OLD_LIBS+=usr/lib32/private/libheimipcc.so.11 @@ -6397,14 +6397,14 @@ OLD_FILES+=usr/bin/ssh-copy-id OLD_FILES+=usr/bin/ssh-keygen OLD_FILES+=usr/bin/ssh-keyscan OLD_FILES+=usr/lib/pam_ssh.so -OLD_LIBS+=usr/lib/pam_ssh.so.5 +OLD_LIBS+=usr/lib/pam_ssh.so.6 OLD_FILES+=usr/lib/private/libssh.a OLD_FILES+=usr/lib/private/libssh.so OLD_LIBS+=usr/lib/private/libssh.so.5 OLD_FILES+=usr/lib/private/libssh_p.a .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/pam_ssh.so -OLD_LIBS+=usr/lib32/pam_ssh.so.5 +OLD_LIBS+=usr/lib32/pam_ssh.so.6 OLD_FILES+=usr/lib32/private/libssh.a OLD_FILES+=usr/lib32/private/libssh.so OLD_LIBS+=usr/lib32/private/libssh.so.5