43 lines
1.1 KiB
Plaintext
43 lines
1.1 KiB
Plaintext
|
From: Jeff Mahoney <jeffm@suse.com>
|
||
|
|
Subject: apparmor: Fix pam includes/linking
|
||
|
|
|
||
|
|
|
||
|
|
---
|
||
|
|
changehat/pam_apparmor/Makefile | 6 +++---
|
||
|
|
changehat/pam_apparmor/pam_apparmor.c | 2 +-
|
||
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
--- a/changehat/pam_apparmor/Makefile
|
||
|
|
+++ b/changehat/pam_apparmor/Makefile
|
||
|
|
@@ -27,8 +27,8 @@ common/Make.rules: $(COMMONDIR)/Make.rul
|
||
|
|
ln -sf $(COMMONDIR) .
|
||
|
|
endif
|
||
|
|
|
||
|
|
-EXTRA_CFLAGS=$(CFLAGS) -fPIC -shared -Wall
|
||
|
|
-LINK_FLAGS=-Xlinker -x
|
||
|
|
+EXTRA_CFLAGS=$(CFLAGS) -fPIC -shared -Wall -I../../libraries/libapparmor/src/
|
||
|
|
+LINK_FLAGS=-Xlinker -x -L../../libraries/libapparmor/src/.libs
|
||
|
|
LIBS=-lpam -lapparmor
|
||
|
|
OBJECTS=${NAME}.o get_options.o
|
||
|
|
|
||
|
|
@@ -42,7 +42,7 @@ $(NAME).so: ${OBJECTS}
|
||
|
|
|
||
|
|
# need some better way of determining this
|
||
|
|
DESTDIR=/
|
||
|
|
-SECDIR=${DESTDIR}/lib/security
|
||
|
|
+SECDIR ?= ${DESTDIR}/lib/security
|
||
|
|
|
||
|
|
.PHONY: install
|
||
|
|
install: $(NAME).so
|
||
|
|
--- a/changehat/pam_apparmor/pam_apparmor.c
|
||
|
|
+++ b/changehat/pam_apparmor/pam_apparmor.c
|
||
|
|
@@ -27,7 +27,7 @@
|
||
|
|
#include <grp.h>
|
||
|
|
#include <syslog.h>
|
||
|
|
#include <errno.h>
|
||
|
|
-#include <sys/apparmor.h>
|
||
|
|
+#include "apparmor.h"
|
||
|
|
#include <security/pam_ext.h>
|
||
|
|
#include <security/pam_modutil.h>
|
||
|
|
|