commit: d4d0e1b9b4048a049550ab603eb6ed069be6fe07
Author: Vit Mojzis <vmojzis <AT> redhat <DOT> com>
AuthorDate: Fri Nov 12 09:28:52 2021 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Nov 20 22:58:24 2021 +0000
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=d4d0e1b9
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 <AT> redhat.com>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
policy/support/loadable_module.spt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/policy/support/loadable_module.spt
b/policy/support/loadable_module.spt
index 8b9d38af..2a99df0c 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
