picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build-sys: s/HAVE_IMA/ENABLE_IMA/

Browse source 
Same justification as for HAVE_UTMP.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-10-03 12:20:49 +02:00
parent 3211da4bcb
commit 392fd235fd
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -1062,7 +1062,7 @@ foreach pair : [['utmp', 'ENABLE_UTMP'],
['ldconfig', 'ENABLE_LDCONFIG'],
['efi', 'ENABLE_EFI'],
['tpm', 'ENABLE_TPM'],
['ima', 'HAVE_IMA'],
['ima', 'ENABLE_IMA'],
['smack', 'HAVE_SMACK'],
['gshadow', 'ENABLE_GSHADOW'],
['idn', 'ENABLE_IDN'],

2
src/basic/build.h
View file

@ -43,7 +43,7 @@
#define _APPARMOR_FEATURE_ "-APPARMOR"
#endif
#if HAVE_IMA
#if ENABLE_IMA
#define _IMA_FEATURE_ "+IMA"
#else
#define _IMA_FEATURE_ "-IMA"

4
src/core/ima-setup.c
View file

@ -33,7 +33,7 @@
#define IMA_POLICY_PATH "/etc/ima/ima-policy"
int ima_setup(void) {
#if HAVE_IMA
#if ENABLE_IMA
_cleanup_fclose_ FILE *input = NULL;
_cleanup_close_ int imafd = -1;
unsigned lineno = 0;
@ -93,6 +93,6 @@ int ima_setup(void) {
done:
log_info("Successfully loaded the IMA custom policy "IMA_POLICY_PATH".");
#endif /* HAVE_IMA */
#endif /* ENABLE_IMA */
return 0;
}