From: Jeff Mahoney Subject: apparmor-parser: Fix recognition of non-inet net domains References: bnc#588185 At some point the definitions of networking domains moved from /usr/include/socket.h with AF_ prefixes to /usr/include/bits/socket.h with PF_ prefixes. This caused the parser to fail to recognize the majority of networking domains. This patch points to the correct location. Signed-off-by: Jeff Mahoney Acked-by: Jeff Mahoney --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/Makefile +++ b/Makefile @@ -181,8 +181,8 @@ parser_version.h: Makefile @echo \#define PARSER_VERSION \"$(VERSION)\" > .ver @mv -f .ver $@ -af_names.h: /usr/include/linux/socket.h - LC_ALL=C sed -n -e '/AF_RXRPC\|AF_MAX\|AF_UNSPEC\|AF_UNIX\|AF_LOCAL\|AF_NETLINK\|AF_LLC\|AF_IUCV\|AF_TIPC\|AF_CAN\|AF_ISDN/d' -e "s/^\#define[ \\t]\\+AF_\\([A-Z0-9_]\\+\\)[ \\t]\\+\\([0-9]\\+\\)\\(.*\\)\$$/AA_GEN_NET_ENT(\"\\L\\1\", \\UAF_\\1)/p" $< > $@ +af_names.h: /usr/include/bits/socket.h + LC_ALL=C sed -n -e '/PF_RXRPC\|PF_MAX\|PF_UNSPEC\|PF_UNIX\|PF_LOCAL\|PF_NETLINK\|PF_LLC\|PF_IUCV\|PF_TIPC\|PF_CAN\|PF_ISDN/d' -e "s/^\#define[ \\t]\\+PF_\\([A-Z0-9_]\\+\\)[ \\t]\\+\\([0-9]\\+\\)\\(.*\\)\$$/AA_GEN_NET_ENT(\"\\L\\1\", \\UPF_\\1)/p" $< > $@ cap_names.h: /usr/include/linux/capability.h LC_ALL=C sed -n -e "/CAP_EMPTY_SET/d" -e "s/^\#define[ \\t]\\+CAP_\\([A-Z0-9_]\\+\\)[ \\t]\\+\\([0-9xa-f]\\+\\)\\(.*\\)\$$/\{\"\\L\\1\", \\UCAP_\\1\},/p" $< > $@