From eb014c79f11f01b25cbb44d81d5ed7fd9b90b836 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 18 Nov 2009 15:33:00 -0500 Subject: [PATCH] Author: Daniel J Walsh Email: dwalsh@redhat.com Subject: Add modules support to semanage Date: Thu, 12 Nov 2009 11:23:15 -0500 On 11/11/2009 01:52 PM, Chad Sellers wrote: > On 9/30/09 2:33 PM, "Daniel J Walsh" wrote: > >> Includes enable and disable. >> > I presume I should hold off on this patch until you have a chance to > resubmit the libsemanage support that it relies on. Let me know if that's > not the case. > > Thanks, > Chad > Lets do this patch. Moves load_policy from /usr/sbin to /sbin Removed cruft. Signed-off-by: Chad Sellers --- libsemanage/src/conf-parse.y | 8 +++++++- policycoreutils/load_policy/Makefile | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libsemanage/src/conf-parse.y b/libsemanage/src/conf-parse.y index 23661bf2..e8852022 100644 --- a/libsemanage/src/conf-parse.y +++ b/libsemanage/src/conf-parse.y @@ -263,7 +263,13 @@ static int semanage_conf_init(semanage_conf_t * conf) calloc(1, sizeof(*(current_conf->load_policy)))) == NULL) { return -1; } - if ((conf->load_policy->path = strdup("/usr/sbin/load_policy")) == NULL) { + + if (access("/sbin/load_policy", X_OK) == 0) { + conf->load_policy->path = strdup("/sbin/load_policy"); + } else { + conf->load_policy->path = strdup("/usr/sbin/load_policy"); + } + if (conf->load_policy->path == NULL) { return -1; } conf->load_policy->args = NULL; diff --git a/policycoreutils/load_policy/Makefile b/policycoreutils/load_policy/Makefile index 2dd29439..a634d4b0 100644 --- a/policycoreutils/load_policy/Makefile +++ b/policycoreutils/load_policy/Makefile @@ -1,6 +1,7 @@ # Installation directories. PREFIX ?= ${DESTDIR}/usr -SBINDIR ?= $(PREFIX)/sbin +SBINDIR ?= $(DESTDIR)/sbin +USRSBINDIR ?= $(PREFIX)/sbin MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale @@ -17,6 +18,8 @@ install: all install -m 755 $(TARGETS) $(SBINDIR) test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8 install -m 644 load_policy.8 $(MANDIR)/man8/ + -mkdir -p $(USRSBINDIR) + ln -sf /sbin/load_policy $(USRSBINDIR)/load_policy clean: -rm -f $(TARGETS) *.o