Commit d6fa07ff authored by Arnout Vandecappelle (Essensium/Mind)'s avatar Arnout Vandecappelle (Essensium/Mind) Committed by Peter Korsgaard
Browse files

linux-pam: fix missing includes

Two patches taken from upstream fix e.g.
http://autobuild.buildroot.org/results/fa31431066ce0f9c554bdb923e59aa0458508224



These patches are in linux-pam 1.1.6 already, but since I don't know
how to test it, I don't want to do a version bump.

Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 401a3d98
Loading
Loading
Loading
Loading
+28 −0
Original line number Diff line number Diff line
Date: Mon, 9 Jul 2012 09:43:11 +0200
Subject: [PATCH] RLIMIT_* variables are no longer defined unless you
 explicitly include sys/resource.h.

Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>

modules/pam_unix/pam_unix_acct.c: Include sys/resource.h.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
[This patch is in linux-pam 1.1.6]
---
 modules/pam_unix/pam_unix_acct.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/pam_unix/pam_unix_acct.c b/modules/pam_unix/pam_unix_acct.c
index 8e90cc9..4a362f8 100644
--- a/modules/pam_unix/pam_unix_acct.c
+++ b/modules/pam_unix/pam_unix_acct.c
@@ -41,6 +41,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <sys/resource.h>
 #include <syslog.h>
 #include <pwd.h>
 #include <shadow.h>
-- 
1.8.2.1
+37 −0
Original line number Diff line number Diff line
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Wed, 10 Oct 2012 18:13:07 +0000
Subject: [PATCH] pam_unix: fix build in --enable-selinux mode

glibc's <sys/wait.h> starting with commit
http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=glibc-2.15-231-gd94a467
does not include <sys/resource.h> for POSIX 2008 conformance reasons, so
when pam is being built with SELinux support enabled, pam_unix_passwd.c
uses getrlimit(2) and therefore should include <sys/resource.h> without
relying on other headers.

* modules/pam_unix/pam_unix_passwd.c: Include <sys/resource.h>.

Reported-by: Guido Trentalancia <guido@trentalancia.com>
Reported-by: "Jory A. Pratt" <anarchy@gentoo.org>
Reported-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
[This patch is in linux-pam 1.1.6]
---
 modules/pam_unix/pam_unix_passwd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c
index 9e1302d..94bc3ec 100644
--- a/modules/pam_unix/pam_unix_passwd.c
+++ b/modules/pam_unix/pam_unix_passwd.c
@@ -58,6 +58,7 @@
 #include <signal.h>
 #include <errno.h>
 #include <sys/wait.h>
+#include <sys/resource.h>
 
 #include <security/_pam_macros.h>
 
-- 
1.8.2.1