On 11/18/09 3:28 PM, "Daniel J Walsh" <dwalsh@xxxxxxxxxx> wrote:
> On 11/18/2009 03:24 PM, Chad Sellers wrote:
>> On 11/12/09 11:23 AM, "Daniel J Walsh" <dwalsh@xxxxxxxxxx> wrote:
>>
>>> On 11/11/2009 01:52 PM, Chad Sellers wrote:
>>>> On 9/30/09 2:33 PM, "Daniel J Walsh" <dwalsh@xxxxxxxxxx> 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.
>>>
>>> diff --git a/libsemanage/src/conf-parse.y b/libsemanage/src/conf-parse.y
>>> index 23661bf..931448f 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)
>>
>> Still missing a curly brace.
>>
>>> return -1;
>>> }
>>> conf->load_policy->args = NULL;
>>> diff --git a/policycoreutils/load_policy/Makefile
>>> b/policycoreutils/load_policy/Makefile
>>> index 2dd2943..91dc6c8 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 -s /sbin/load_policy $(USRSBINDIR)/load_policy
>>>
>> Still using -s instead of -sf. You never responded to my previous email (
>> http://marc.info/?l=selinux&m=125788814205762&w=2 ). Are you ok with these 2
>> fixes? If so, I can make the changes and merge this.
>>
>> Thanks,
>> Chad
>>
>>> clean:
>>> -rm -f $(TARGETS) *.o
>>
> Yes go ahead.
OK, merged as of policycoreutils 2.0.76 and libsemanage 2.0.42.
Thanks,
Chad
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@xxxxxxxxxxxxx with
the words "unsubscribe selinux" without quotes as the message.
