From 392fd235fd6301f5059d7b62ebacc129561e8c8f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 3 Oct 2017 12:20:49 +0200 Subject: [PATCH] build-sys: s/HAVE_IMA/ENABLE_IMA/ Same justification as for HAVE_UTMP. --- meson.build | 2 +- src/basic/build.h | 2 +- src/core/ima-setup.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 5c98c93..26aa699 100644 --- a/meson.build +++ b/meson.build @@ -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'], diff --git a/src/basic/build.h b/src/basic/build.h index 522974b..bb65a2e 100644 --- a/src/basic/build.h +++ b/src/basic/build.h @@ -43,7 +43,7 @@ #define _APPARMOR_FEATURE_ "-APPARMOR" #endif -#if HAVE_IMA +#if ENABLE_IMA #define _IMA_FEATURE_ "+IMA" #else #define _IMA_FEATURE_ "-IMA" diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c index 1aaae9f..6c7b209 100644 --- a/src/core/ima-setup.c +++ b/src/core/ima-setup.c @@ -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; } -- 2.7.4