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

Allow for a location to alias to multiple locations. Ie.

Browse Source 
alias / -> /rofs,
alias / -> /rwfs,
This commit is contained in:
John Johansen 2010-02-12 13:51:27 -08:00
parent ee00b0cea2
commit 725328c209
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
parser/parser_alias.c
View File

@ -39,19 +39,24 @@ static int compare_alias(const void *a, const void *b)
{ {
char *a_name = ((struct alias_rule *) a)->from; char *a_name = ((struct alias_rule *) a)->from;
char *b_name = ((struct alias_rule *) b)->from; char *b_name = ((struct alias_rule *) b)->from;
return strcmp(a_name, b_name); int res = strcmp(a_name, b_name);
if (res == 0) {
a_name = ((struct alias_rule *) a)->to;
b_name = ((struct alias_rule *) b)->to;
res = strcmp(a_name, b_name);
}
return res;
} }
int new_alias(const char *from, const char *to) int new_alias(const char *from, const char *to)
{ {
struct alias_rule *alias, **result; struct alias_rule *alias, **result;
alias = malloc(sizeof(struct alias_rule)); alias = calloc(1, sizeof(struct alias_rule));
if (!alias) { if (!alias) {
PERROR("Failed to allocate memory: %s\n", strerror(errno)); PERROR("Failed to allocate memory: %s\n", strerror(errno));
goto fail; goto fail;
} }
memset(alias, 0, sizeof(*alias));
alias->from = strdup(from); alias->from = strdup(from);
if (!alias->from) { if (!alias->from) {
PERROR("Failed to allocate memory: %s\n", strerror(errno)); PERROR("Failed to allocate memory: %s\n", strerror(errno));
@ -85,7 +90,8 @@ fail:
free(alias->to); free(alias->to);
free(alias); free(alias);
} }
return 0; /* just drop duplicate aliases don't actually fail */
return 1;
} }
static char *do_alias(struct alias_rule *alias, const char *target) static char *do_alias(struct alias_rule *alias, const char *target)

2
parser/tst/simple_tests/rewrite/alias_dupe_1.sd
View File

@ -1,5 +1,5 @@
#=DESCRIPTION Test of duplicate alias detection #=DESCRIPTION Test of duplicate alias detection
#=EXRESULT FAIL #=EXRESULT PASS
@{MEEP} = meep moop @{MEEP} = meep moop
alias /etc -> /Etcetera, alias /etc -> /Etcetera,