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

Cherry picked elements from trunk commit 1437: fix serious compiler

Browse Source 
warnings, silence an error in non-rpm build environs.

Nominated-by: Steve Beattie <sbeattie@ubuntu.com>
Acked-By: Kees Cook <kees@ubuntu.com>
This commit is contained in:
Steve Beattie 2010-09-15 10:24:55 -07:00
parent 9578c217cb
commit c2109f2c3b
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/Make.rules
View File

@ -48,7 +48,7 @@ BUILDDIR=$(shell if [ -d "${TESTBUILDDIR}" ] ; then \
echo "/tmp/${NAME}" ; \ echo "/tmp/${NAME}" ; \
fi ;) fi ;)
endif endif
RPMHOSTVENDOR=$(shell rpm --eval "%{_host_vendor}") RPMHOSTVENDOR=$(shell which rpm && rpm --eval "%{_host_vendor}")
ifndef DISTRO ifndef DISTRO
DISTRO=$(shell if [ -f /etc/slackware-version ] ; then \ DISTRO=$(shell if [ -f /etc/slackware-version ] ; then \
echo slackware ; \ echo slackware ; \

2
parser/parser_main.c
View File

@ -34,6 +34,8 @@
#include <unistd.h> #include <unistd.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "parser.h" #include "parser.h"
#include "parser_version.h" #include "parser_version.h"

2
parser/parser_yacc.y
View File

@ -412,7 +412,7 @@ flagvals: flagval
flagval: TOK_FLAG_ID flagval: TOK_FLAG_ID
{ {
struct flagval fv = {0, 0, 0}; struct flagval fv = { 0, 0, 0, 0 };
if (strcmp($1, "debug") == 0) { if (strcmp($1, "debug") == 0) {
yyerror(_("Profile flag 'debug' is no longer valid.")); yyerror(_("Profile flag 'debug' is no longer valid."));
} else if (strcmp($1, "complain") == 0) { } else if (strcmp($1, "complain") == 0) {