From 1ea6e9a5d2d50ad3184326fb1631a8b9e3f1018c Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Fri, 12 Aug 2016 15:19:56 +0800 Subject: proftpd: fix system account login failure When pam is enabled, 1, Customize the proftpd.conf to use pam to authenticate 2, Add proftpd pam configuration file /etc/pam.d/proftpd Signed-off-by: Mingli Yu Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'meta-networking') diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb index b6fd4b2e11..2332ef856d 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb @@ -92,6 +92,15 @@ do_install () { # create the pub directory mkdir -p ${D}/home/${FTPUSER}/pub/ chown -R ${FTPUSER}:${FTPGROUP} ${D}/home/${FTPUSER}/pub + if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then + # install proftpd pam configuration + install -d ${D}${sysconfdir}/pam.d + install -m 644 ${S}/contrib/dist/rpm/ftp.pamd ${D}${sysconfdir}/pam.d/proftpd + sed -i '/ftpusers/d' ${D}${sysconfdir}/pam.d/proftpd + # specify the user Authentication config + sed -i '/^MaxInstances/a\AuthPAM on\nAuthPAMConfig proftpd' \ + ${D}${sysconfdir}/proftpd.conf + fi install -d ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/proftpd.service ${D}/${systemd_unitdir}/system -- cgit v1.2.3-54-g00ecf