From: Eric Leblond <eric@regit.org>
Date: Thu, 6 Dec 2012 14:33:25 +0000 (+0100)
Subject: magic: freebsd magic return differently
X-Git-Tag: suricata-1.4~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e690b3bbc96bdefb130547c7c8dd94c8ff573a83;p=thirdparty%2Fsuricata.git

magic: freebsd magic return differently

FreeBSD don't return "Microsoft Office Document" but
"OLE 2 Compound Document". This patch takes this into account.
---

diff --git a/src/util-magic.c b/src/util-magic.c
index fbc9b7e51f..d98051943f 100644
--- a/src/util-magic.c
+++ b/src/util-magic.c
@@ -150,6 +150,12 @@ void MagicDeinit(void) {
 
 #ifdef UNITTESTS
 
+#ifndef OS_FREEBSD
+#define MICROSOFT_OFFICE_DOC "Microsoft Office Document"
+#else
+#define MICROSOFT_OFFICE_DOC "OLE 2 Compound Document"
+#endif
+
 /** \test magic lib calls -- init */
 int MagicInitTest01(void) {
     magic_t magic_ctx;
@@ -242,7 +248,7 @@ int MagicDetectTest02(void) {
         return 0;
 
     result = (char *)magic_buffer(magic_ctx, (void *)buffer, buffer_len);
-    if (result == NULL || strcmp(result, "Microsoft Office Document") != 0) {
+    if (result == NULL || strcmp(result, MICROSOFT_OFFICE_DOC) != 0) {
         printf("result %p:%s, not \"Microsoft Office Document\": ", result,result?result:"(null)");
         goto end;
     }
@@ -403,7 +409,7 @@ int MagicDetectTest06(void) {
     MagicInit();
 
     result = MagicGlobalLookup(buffer, buffer_len);
-    if (result == NULL || strcmp(result, "Microsoft Office Document") != 0) {
+    if (result == NULL || strcmp(result, MICROSOFT_OFFICE_DOC) != 0) {
         printf("result %p:%s, not \"Microsoft Office Document\": ", result,result?result:"(null)");
         goto end;
     }