[PATCH 0/2] PAM sanity

[PATCH 0/2] PAM sanity

[Ross Burton]

Hi,

A whitespace fix for libpam, and then something more "interesting".  I spent an
hour earlier cursing my build before finally realising the reason that my PAM
modules were not running on login was because the pam DISTRO_FEATURE wasn't
enabled.  So, here's a patch to make libpam warn if it's being build without the
pam DISTRO_FEATURE.

Ross

Ross Burton (2):
  libpam: fix whitespace in shell function
  libpam: check if PAM is enabled when building

 meta/recipes-extended/pam/libpam_1.1.6.bb |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

-- 
1.7.10.4

[PATCH 1/2] libpam: fix whitespace in shell function

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-extended/pam/libpam_1.1.6.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
index 94101d4..96133c3 100644
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -96,6 +96,6 @@ do_install() {
 	install -d ${D}${sysconfdir}/pam.d/     
 	install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/
 
-    # The lsb requires unix_chkpwd has setuid permission
-    chmod 4755 ${D}${sbindir}/unix_chkpwd
+	# The lsb requires unix_chkpwd has setuid permission
+	chmod 4755 ${D}${sbindir}/unix_chkpwd
 }
-- 
1.7.10.4

[PATCH 2/2] libpam: check if PAM is enabled when building

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-extended/pam/libpam_1.1.6.bb |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
index 96133c3..f811f4c 100644
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -99,3 +99,9 @@ do_install() {
 	# The lsb requires unix_chkpwd has setuid permission
 	chmod 4755 ${D}${sbindir}/unix_chkpwd
 }
+
+python do_pam_sanity () {
+    if "pam" not in d.getVar("DISTRO_FEATURES", True).split():
+        bb.warn("Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly")
+}
+addtask pam_sanity before do_configure
-- 
1.7.10.4