From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C347B138A1A for ; Sun, 15 Feb 2015 04:48:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DC9EE0982; Sun, 15 Feb 2015 04:48:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1F0AE0982 for ; Sun, 15 Feb 2015 04:48:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1D103406D0 for ; Sun, 15 Feb 2015 04:48:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3E4F11C99 for ; Sun, 15 Feb 2015 04:48:51 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1423884890.adef1185caa1f372420d6dd71d4968115ae0e3bf.vapier@gentoo> Subject: [gentoo-commits] proj/pambase:master commit in: / X-VCS-Repository: proj/pambase X-VCS-Files: Makefile basic-conf system-auth.in X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: adef1185caa1f372420d6dd71d4968115ae0e3bf X-VCS-Branch: master Date: Sun, 15 Feb 2015 04:48:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7002fb65-149d-4dc4-9cf2-1459538909d4 X-Archives-Hash: 8f6c6c2504068e7dcae3f633c9f0b1e3 commit: adef1185caa1f372420d6dd71d4968115ae0e3bf Author: Mike Frysinger gentoo org> AuthorDate: Sat Feb 14 03:34:50 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat Feb 14 03:34:50 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/pambase.git;a=commit;h=adef1185 make nullok into a build time option --- Makefile | 4 ++++ basic-conf | 6 ++++++ system-auth.in | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 339de62..a459fd0 100644 --- a/Makefile +++ b/Makefile @@ -56,6 +56,10 @@ ifeq "$(KRB5)" "yes" PAMFLAGS += -DHAVE_KRB5=1 endif +ifeq "$(NULLOK)" "yes" +PAMFLAGS += -DWANT_NULLOK=1 +endif + ifeq "$(SHA512)" "yes" PAMFLAGS += -DWANT_SHA512=1 endif diff --git a/basic-conf b/basic-conf index eaa1cb0..5ab72c0 100644 --- a/basic-conf +++ b/basic-conf @@ -29,6 +29,12 @@ #define LIKEAUTH #endif +#if WANT_NULLOK +#define NULLOK nullok +#else +#define NULLOK +#endif + #define KRB5_PARAMS DEBUG ignore_root try_first_pass /* By using the extended Linux-PAM syntax for this, it is possible to diff --git a/system-auth.in b/system-auth.in index 43df701..1f7ffbd 100644 --- a/system-auth.in +++ b/system-auth.in @@ -7,7 +7,7 @@ auth sufficient pam_ssh.so #if HAVE_KRB5 auth KRB5_CONTROL pam_krb5.so KRB5_PARAMS #endif -auth required pam_unix.so try_first_pass LIKEAUTH nullok DEBUG +auth required pam_unix.so try_first_pass LIKEAUTH NULLOK DEBUG /* This is needed to make sure that the Kerberos skip-on-success won't cause a bad jump. */ auth optional pam_permit.so @@ -27,7 +27,7 @@ password required pam_passwdqc.so min=8,8,8,8,8 retry=3 #if HAVE_KRB5 password KRB5_CONTROL pam_krb5.so KRB5_PARAMS #endif -password required pam_unix.so try_first_pass UNIX_AUTHTOK nullok UNIX_EXTENDED_ENCRYPTION DEBUG +password required pam_unix.so try_first_pass UNIX_AUTHTOK NULLOK UNIX_EXTENDED_ENCRYPTION DEBUG /* This is needed to make sure that the Kerberos skip-on-success won't cause a bad jump. */ password optional pam_permit.so