build-sys: s/HAVE_IMA/ENABLE_IMA/
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 3 Oct 2017 10:20:49 +0000 (12:20 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 4 Oct 2017 10:09:50 +0000 (12:09 +0200)
Same justification as for HAVE_UTMP.

meson.build
src/basic/build.h
src/core/ima-setup.c

index 5c98c93..26aa699 100644 (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'],
index 522974b..bb65a2e 100644 (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"
index 1aaae9f..6c7b209 100644 (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;
 }