|
@@ -25,9 +25,9 @@ Last-Update: 2016-06-27
|
|
+
|
|
+
|
|
--- a/src/apprentice.c
|
|
--- a/src/apprentice.c
|
|
+++ b/src/apprentice.c
|
|
+++ b/src/apprentice.c
|
|
-@@ -452,7 +452,7 @@
|
|
|
|
- #ifndef COMPILE_ONLY
|
|
|
|
- map = apprentice_map(ms, fn);
|
|
|
|
|
|
+@@ -454,7 +454,7 @@
|
|
|
|
+ if (map == (struct magic_map *)-1)
|
|
|
|
+ return -1;
|
|
if (map == NULL) {
|
|
if (map == NULL) {
|
|
- if (ms->flags & MAGIC_CHECK)
|
|
- if (ms->flags & MAGIC_CHECK)
|
|
+ if (ms->flags & MAGIC_CHECK && strcmp("/etc/magic", fn) != 0)
|
|
+ if (ms->flags & MAGIC_CHECK && strcmp("/etc/magic", fn) != 0)
|
|
@@ -55,7 +55,7 @@ Last-Update: 2016-06-27
|
|
magic file
|
|
magic file
|
|
.Pa __MAGIC__.mgc ,
|
|
.Pa __MAGIC__.mgc ,
|
|
or the files in the directory
|
|
or the files in the directory
|
|
-@@ -469,12 +470,6 @@
|
|
|
|
|
|
+@@ -472,12 +473,6 @@
|
|
The order of entries in the magic file is significant.
|
|
The order of entries in the magic file is significant.
|
|
Depending on what system you are using, the order that
|
|
Depending on what system you are using, the order that
|
|
they are put together may be incorrect.
|
|
they are put together may be incorrect.
|