Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e570145 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by John Johansen
Browse files

AppArmor: Fix location of const qualifier on generated string tables 



Signed-off-by: default avatarTetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent b01d3fb9

security/apparmor/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ clean-files := capability_names.h rlim_names.h 
# to

# to

#    [1] = "dac_override",

#    [1] = "dac_override",

quiet_cmd_make-caps = GEN     $@

quiet_cmd_make-caps = GEN     $@

cmd_make-caps = echo "static const char const *capability_names[] = {" > $@ ;\

cmd_make-caps = echo "static const char *const capability_names[] = {" > $@ ;\

	sed $< >>$@ -r -n -e '/CAP_FS_MASK/d' \

	sed $< >>$@ -r -n -e '/CAP_FS_MASK/d' \

	-e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/[\2] = "\L\1",/p';\

	-e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/[\2] = "\L\1",/p';\

	echo "};" >> $@

	echo "};" >> $@
@@ -43,7 +43,7 @@ cmd_make-caps = echo "static const char const *capability_names[] = {" > $@ ;\ 
# to

# to

# #define AA_FS_RLIMIT_MASK "fsize stack"

# #define AA_FS_RLIMIT_MASK "fsize stack"

quiet_cmd_make-rlim = GEN     $@

quiet_cmd_make-rlim = GEN     $@

cmd_make-rlim = echo "static const char const *rlim_names[RLIM_NLIMITS] = {" \

cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \

	> $@ ;\

	> $@ ;\

	sed $< >> $@ -r -n \

	sed $< >> $@ -r -n \

	    -e 's/^\# ?define[ \t]+(RLIMIT_([A-Z0-9_]+)).*/[\1] = "\L\2",/p';\

	    -e 's/^\# ?define[ \t]+(RLIMIT_([A-Z0-9_]+)).*/[\1] = "\L\2",/p';\