aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVit Mojzis <vmojzis@redhat.com>2021-11-12 10:28:52 +0100
committerJason Zaman <perfinion@gentoo.org>2021-11-20 14:58:24 -0800
commitd4d0e1b9b4048a049550ab603eb6ed069be6fe07 (patch)
tree0096359254a5c07044f319820a9221f436ad1d4b /policy/support
parentvarious: Module version bump. (diff)
downloadhardened-refpolicy-d4d0e1b9b4048a049550ab603eb6ed069be6fe07.tar.gz
hardened-refpolicy-d4d0e1b9b4048a049550ab603eb6ed069be6fe07.tar.bz2
hardened-refpolicy-d4d0e1b9b4048a049550ab603eb6ed069be6fe07.zip
Improve error message on duplicate definition of interface
Specify which file contains the original definition. Old: ipa.if:284: Error: duplicate definition of ipa_cert_filetrans_named_content(). Original definition on 284. New: ipa.if:284: Error: duplicate definition of ipa_cert_filetrans_named_content(). Original definition on /usr/share/selinux/devel/include/contrib/ipa.if:284. Signed-off-by: Vit Mojzis <vmojzis@redhat.com> Signed-off-by: Jason Zaman <perfinion@gentoo.org>
Diffstat (limited to 'policy/support')
-rw-r--r--policy/support/loadable_module.spt4
1 files changed, 2 insertions, 2 deletions
diff --git a/policy/support/loadable_module.spt b/policy/support/loadable_module.spt
index 8b9d38af8..2a99df0c1 100644
--- a/policy/support/loadable_module.spt
+++ b/policy/support/loadable_module.spt
@@ -60,7 +60,7 @@ define(`policy_m4_comment',`
# template(name,rules)
#
define(`template',` dnl
- ifdef(`$1',`refpolicyerr(`duplicate definition of $1(). Original definition on '$1.) define(`__if_error')',`define(`$1',__line__)') dnl
+ ifdef(`$1',`refpolicyerr(`duplicate definition of $1(). Original definition on '$1.) define(`__if_error')',`define(`$1',__file__:__line__)') dnl
`define(`$1',` dnl
pushdef(`policy_call_depth',incr(policy_call_depth)) dnl
policy_m4_comment(policy_call_depth,begin `$1'(dollarsstar)) dnl
@@ -77,7 +77,7 @@ define(`template',` dnl
# interface(name,rules)
#
define(`interface',` dnl
- ifdef(`$1',`refpolicyerr(`duplicate definition of $1(). Original definition on '$1.) define(`__if_error')',`define(`$1',__line__)') dnl
+ ifdef(`$1',`refpolicyerr(`duplicate definition of $1(). Original definition on '$1.) define(`__if_error')',`define(`$1',__file__:__line__)') dnl
`define(`$1',` dnl
pushdef(`policy_call_depth',incr(policy_call_depth)) dnl
policy_m4_comment(policy_call_depth,begin `$1'(dollarsstar)) dnl