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 3E31913825A for ; Fri, 13 May 2016 17:13:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1CF7E0802; Fri, 13 May 2016 17:13:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 643DFE0802 for ; Fri, 13 May 2016 17:13:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B5AB6340831 for ; Fri, 13 May 2016 17:12:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA915336 for ; Fri, 13 May 2016 17:12:57 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1463159123.3b5a8b331e81ecd9a9362553c16f4527291d5528.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/Makefile src/rc/supervise-daemon.c src/rc/supervise-daemon.pam X-VCS-Directories: src/rc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 3b5a8b331e81ecd9a9362553c16f4527291d5528 X-VCS-Branch: master Date: Fri, 13 May 2016 17:12:57 +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: 5674a467-c89d-4aeb-9790-b5fd5fe805d0 X-Archives-Hash: a9c0cdd1760c6f0b8444512d9b837531 commit: 3b5a8b331e81ecd9a9362553c16f4527291d5528 Author: William Hubbs gmail com> AuthorDate: Fri May 13 17:05:23 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri May 13 17:05:23 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=3b5a8b33 supervise-daemon: add pam service file src/rc/Makefile | 1 + src/rc/supervise-daemon.c | 2 +- src/rc/supervise-daemon.pam | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/rc/Makefile b/src/rc/Makefile index d4759e7..74d74a0 100644 --- a/src/rc/Makefile +++ b/src/rc/Makefile @@ -75,6 +75,7 @@ install: all if test "${MKPAM}" = pam; then \ ${INSTALL} -d ${DESTDIR}${PAMDIR}; \ ${INSTALL} -m ${PAMMODE} start-stop-daemon.pam ${DESTDIR}${PAMDIR}/start-stop-daemon; \ + ${INSTALL} -m ${PAMMODE} supervise-daemon.pam ${DESTDIR}${PAMDIR}/supervise-daemon; \ fi check test:: diff --git a/src/rc/supervise-daemon.c b/src/rc/supervise-daemon.c index 6bb75f3..2d8287f 100644 --- a/src/rc/supervise-daemon.c +++ b/src/rc/supervise-daemon.c @@ -202,7 +202,7 @@ static void child_process(char *exec, char **argv) #ifdef HAVE_PAM if (changeuser != NULL) { - pamr = pam_start("start-stop-daemon", + pamr = pam_start("supervise-daemon", changeuser, &conv, &pamh); if (pamr == PAM_SUCCESS) diff --git a/src/rc/supervise-daemon.pam b/src/rc/supervise-daemon.pam new file mode 100644 index 0000000..a1bada2 --- /dev/null +++ b/src/rc/supervise-daemon.pam @@ -0,0 +1,6 @@ +#%PAM-1.0 + +auth required pam_permit.so +account required pam_permit.so +password required pam_deny.so +session optional pam_limits.so