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

Submitted By: Mario Fetka (mario dot fetka at gmail dot com)

Browse Source 
Description: fix compile on build

Patch from Gentoo community:
  - fix up a couple of missing semicolons in syntax (bison compensates
    by emitting it's own)
  - Fix yet another variable tyop in rc.apparmor.functions
  - dump stderr of ls in rc.apparmor.functions to /dev/null
  - add an install-unknown make target
This commit is contained in:
Steve Beattie 2008-11-18 17:33:38 +00:00
parent aed481debe
commit 6cfcb1a823
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
parser/Makefile
View File

@ -252,6 +252,9 @@ install-slackware:
.PHONY: install-debian .PHONY: install-debian
install-debian: install-debian:
.PHONY: install-unknown
install-unknown:
INSTALLDEPS=$(TOOLS) INSTALLDEPS=$(TOOLS)
ifdef DISTRO ifdef DISTRO
INSTALLDEPS+=install-$(DISTRO) INSTALLDEPS+=install-$(DISTRO)

4
parser/parser_yacc.y
View File

@ -544,7 +544,7 @@ rules: rules opt_audit_flag TOK_DENY network_rule
free(entry); free(entry);
} }
$$ = $1 $$ = $1;
} }
rules: rules opt_audit_flag network_rule rules: rules opt_audit_flag network_rule
@ -582,7 +582,7 @@ rules: rules opt_audit_flag network_rule
free(entry); free(entry);
} }
$$ = $1 $$ = $1;
} }
rules: rules change_profile rules: rules change_profile

4
parser/rc.apparmor.functions
View File

@ -68,7 +68,7 @@ else
fi fi
# SUBDOMAIN_DIR and APPARMOR_DIR might be defined in subdomain.conf|apparmor.conf # SUBDOMAIN_DIR and APPARMOR_DIR might be defined in subdomain.conf|apparmor.conf
if [ -d "${APPAMROR_DIR}" ] ; then if [ -d "${APPARMOR_DIR}" ] ; then
PROFILE_DIR=${APPARMOR_DIR} PROFILE_DIR=${APPARMOR_DIR}
elif [ -d "${SUBDOMAIN_DIR}" ] ; then elif [ -d "${SUBDOMAIN_DIR}" ] ; then
PROFILE_DIR=${SUBDOMAIN_DIR} PROFILE_DIR=${SUBDOMAIN_DIR}
@ -115,7 +115,7 @@ is_apparmor_present() {
grep -qE "^($modules)[[:space:]]" /proc/modules grep -qE "^($modules)[[:space:]]" /proc/modules
if [ $? -ne 0 ] ; then if [ $? -ne 0 ] ; then
ls /sys/module/apparmor | grep -qE "^($modules)" ls /sys/module/apparmor 2>/dev/null | grep -qE "^($modules)"
fi fi
return $? return $?