linux-ext4 - [PATCH] misc: fix build without magic.h

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <CABz95_A18aY0VkamhuoZ-ziAVf2mzs6vsCmxbUyVVxDet49++A@mail.gmail.com>
Date:	Thu, 9 Oct 2014 22:39:22 +0100
From:	Steven Honeyman <stevenhoneyman@...il.com>
To:	linux-ext4@...r.kernel.org
Cc:	tytso@....edu
Subject: [PATCH] misc: fix build without magic.h

This prevents a failed build if magic.h doesn't exist, because type
magic_t will be unknown.

Fixes: d2e3c0dc60cd ("misc: if dlopen() is available, use it to load
the libmagic library")
Signed-off-by: Steven Honeyman <stevenhoneyman@...il.com>
---
 misc/plausible.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/plausible.c b/misc/plausible.c
index aea4fce..00bc6e2 100644
--- a/misc/plausible.c
+++ b/misc/plausible.c
@@ -36,12 +36,12 @@
 #include "nls-enable.h"
 #include "blkid/blkid.h"

+#ifdef HAVE_MAGIC_H
 static magic_t (*dl_magic_open)(int);
 static const char *(*dl_magic_file)(magic_t, const char *);
 static int (*dl_magic_load)(magic_t, const char *);
 static void (*dl_magic_close)(magic_t);

-#ifdef HAVE_MAGIC_H
 #ifdef HAVE_DLOPEN
 #include <dlfcn.h>

-- 
2.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html