[gentoo-commits] proj/openrc:master commit in: src/rc/

[William Hubbs]

commit:     3b5a8b331e81ecd9a9362553c16f4527291d5528
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri May 13 17:05:23 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> 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