RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Author: Daniel J Walsh 

Email: dwalsh@redhat.com
Subject: Add glob support for restorecond
Date: Mon, 08 Sep 2008 15:03:51 -0400

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I have added supported for GLOB expressions in restorecond.  In order to
get nsplugin to work well, you need all of the contents of the homedir
labeled correctly.  Unfortunately gnome creates directories at a fairly
random pace.  FCFS.  So it is very difficult to get transitions to
happen properly.  As a tradeoff, we can use restorecond to watch the
homedir and relabel the directory when it is created.  I know this is a
potential race condition. where some of the files created in the
directory will still have the wrong context, but I don't know of a
better solution.

Telling everyone they need to restorcon -R -v ~ is not a great solution.
 If you are worried about information flow you should never rely on
restorecond.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkjFdxcACgkQrlYvE4MpobPtjACg3uyqaHD78FRxdaG5mfitnoB/
lh0AnjvfDC2vmCWisxzWq2qFsZMMu3XK
=JiG7
-----END PGP SIGNATURE-----

Signed-off-by: Joshua Brindle <method@manicmethod.com>
This commit is contained in:
Joshua Brindle 2008-09-07 18:51:09 -04:00
parent ceb5792c21
commit 64d7ef5d44
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
policycoreutils/restorecond/restorecond.conf
View File

@ -1,7 +1,8 @@
/etc/services
/etc/resolv.conf /etc/resolv.conf
/etc/samba/secrets.tdb /etc/samba/secrets.tdb
/etc/mtab /etc/mtab
/var/run/utmp /var/run/utmp
/var/log/wtmp /var/log/wtmp
~/public_html ~/*
~/.mozilla/plugins/libflashplayer.so ~/.mozilla/plugins/libflashplayer.so

13
policycoreutils/restorecond/stringslist.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2006 Red Hat * Copyright (C) 2006, 2008 Red Hat
* see file 'COPYING' for use and warranty information * see file 'COPYING' for use and warranty information
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -27,6 +27,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "stringslist.h" #include "stringslist.h"
#include "restorecond.h" #include "restorecond.h"
#include <fnmatch.h>
/* Sorted lists */ /* Sorted lists */
void strings_list_add(struct stringsList **list, const char *string) void strings_list_add(struct stringsList **list, const char *string)
@ -57,11 +58,9 @@ void strings_list_add(struct stringsList **list, const char *string)
int strings_list_find(struct stringsList *ptr, const char *string) int strings_list_find(struct stringsList *ptr, const char *string)
{ {
while (ptr) { while (ptr) {
int cmp = strcmp(string, ptr->string); int cmp = fnmatch(ptr->string, string, 0);
if (cmp < 0) if (cmp == 0)
return -1; /* Not on list break out to add */ return 0; /* Match found */
if (cmp == 0)
return 0; /* Already on list */
ptr = ptr->next; ptr = ptr->next;
} }
return -1; return -1;
@ -120,6 +119,7 @@ int main(int argc, char **argv)
if (strings_list_diff(list, list1) == 0) if (strings_list_diff(list, list1) == 0)
printf("strings_list_diff test2 bug\n"); printf("strings_list_diff test2 bug\n");
strings_list_add(&list1, "/etc/walsh"); strings_list_add(&list1, "/etc/walsh");
strings_list_add(&list1, "/etc/walsh/*");
strings_list_add(&list1, "/etc/resolv.conf"); strings_list_add(&list1, "/etc/resolv.conf");
strings_list_add(&list1, "/etc/mtab1"); strings_list_add(&list1, "/etc/mtab1");
if (strings_list_diff(list, list1) == 0) if (strings_list_diff(list, list1) == 0)
@ -127,6 +127,7 @@ int main(int argc, char **argv)
printf("strings list\n"); printf("strings list\n");
strings_list_print(list); strings_list_print(list);
printf("strings list1\n"); printf("strings list1\n");
strings_list_find(list1, "/etc/walsh/dan");
strings_list_print(list1); strings_list_print(list1);
strings_list_free(list); strings_list_free(list);
strings_list_free(list1); strings_list_free(list1);