mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-30 22:05:27 +00:00
Code Issues Releases Wiki Activity

Remove pcre and update tests where necessary

Browse Source
This commit is contained in:
John Johansen
2010-07-31 16:00:52 -07:00
parent 06ebb0b6d6
commit b5c780d2a1
16 changed files with 24 additions and 6206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
parser/parser_main.c
View File

@@ -30,6 +30,7 @@
#include <fcntl.h>
#include <mntent.h>
#include <libintl.h>
#include <linux/limits.h>
#include <locale.h>
#define _(s) gettext(s)
@@ -53,7 +54,6 @@
#define MATCH_STRING "/sys/kernel/security/" MODULE_NAME "/matching"
#define FLAGS_FILE "/sys/kernel/security/" MODULE_NAME "/features"
#define MOUNTED_FS "/proc/mounts"
#define PCRE "pattern=pcre"
#define AADFA "pattern=aadfa"
#define PRIVILEGED_OPS (write_cache || kernel_load)
@@ -607,9 +607,6 @@ static void get_match_string(void) {
out:
if (match_string) {
if (strstr(match_string, PCRE))
regex_type = AARE_PCRE;
if (strstr(match_string, AADFA))
regex_type = AARE_DFA;
@@ -658,20 +655,6 @@ fail:
return;
}
/* return 1 --> PCRE should work fine
return 0 --> no PCRE support */
static int regex_support(void) {
/* no match string, predates (or postdates?) the split matching
module design */
if (!match_string)
return 1;
if (regex_type != AARE_NONE)
return 1;
return 0;
}
int process_binary(int option, char *profilename)
{
char *buffer = NULL;
@@ -876,10 +859,6 @@ int process_profile(int option, char *profilename)
goto out;
}
if (!regex_support()) {
die_if_any_regex();
}
retval = load_policy(option);
out: