mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 14:25:52 +00:00
Code Issues Releases Wiki Activity

fix miss break #240986. Back out partial commit of dfa matcher support (that was mistakenly submitted)

Browse Source
This commit is contained in:
John Johansen
2007-02-01 21:45:39 +00:00
parent d1f8df2fa5
commit 20dbc4d8cb
7 changed files with 72 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
parser/parser_main.c
View File

@@ -48,7 +48,6 @@
#define MATCH_STRING "/sys/kernel/security/" MODULE_NAME "/matching"
#define MOUNTED_FS "/proc/mounts"
#define PCRE "pattern=pcre"
#define AADFA "pattern=aadfa"
#define UNPRIVILEGED_OPS (debug || preprocess_only || option == OPTION_STDOUT || names_only || \
dump_vars || dump_expanded_vars)
@@ -66,8 +65,6 @@ int conf_quiet = 0;
char *subdomainbase = NULL;
char *profilename;
char *match_string = NULL;
int regex_type = AARE_NONE;
extern int current_lineno;
struct option long_options[] = {
@@ -390,7 +387,7 @@ static void get_match_string(void) {
/* has process_args() already assigned a match string? */
if (match_string)
goto out;
return;
FILE *ms = fopen(MATCH_STRING, "r");
if (!ms)
@@ -407,28 +404,22 @@ 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;
}
if (ms)
fclose(ms);
fclose(ms);
return;
}
/* return 1 --> PCRE should work fine
return 0 --> no PCRE support */
static int regex_support(void) {
static int pcre_support(void) {
get_match_string();
/* no match string, predates (or postdates?) the split matching
module design */
if (!match_string)
return 1;
if (regex_type != AARE_NONE)
if (strstr(match_string, PCRE))
return 1;
return 0;
@@ -446,9 +437,6 @@ int process_profile(int option, char *profilename)
if (retval != 0)
goto out;
/* Get the match string to determine type of regex support needed */
get_match_string();
retval = post_process_policy();
if (retval != 0) {
PERROR(_("%s: Errors found in file. Aborting.\n"), progname);
@@ -482,7 +470,7 @@ int process_profile(int option, char *profilename)
if (!subdomainbase && !preprocess_only && !(option == OPTION_STDOUT))
find_subdomainfs_mountpoint();
if (!regex_support()) {
if (!pcre_support()) {
die_if_any_regex();
}