Shared secret policy should be stealth

diff --git a/MagickCore/option.c b/MagickCore/option.c
index d48d78607bea672c513196978756f2b8c7a5cf45..d665966db89a718c00bd3c6dcf4c95cd64d5abc7 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1541,6 +1541,7 @@ static const OptionInfo
   PolicyDomainOptions[] =
   {
     { "Undefined", UndefinedPolicyDomain, UndefinedOptionFlag, MagickTrue },
+    { "Cache", CachePolicyDomain, UndefinedOptionFlag, MagickFalse },
     { "Coder", CoderPolicyDomain, UndefinedOptionFlag, MagickFalse },
     { "Delegate", DelegatePolicyDomain, UndefinedOptionFlag, MagickFalse },
     { "Filter", FilterPolicyDomain, UndefinedOptionFlag, MagickFalse },

diff --git a/MagickCore/policy.c b/MagickCore/policy.c
index e01f09da5fa2c17ad21f5fc66b3fe2c611933fd6..f2ced8b938773d64289d6e933b748fb1636378b1 100644 (file)
--- a/MagickCore/policy.c
+++ b/MagickCore/policy.c
@@ -669,7 +669,8 @@ MagickExport MagickBooleanType ListPolicyInfo(FILE *file,
     domain=CommandOptionToMnemonic(MagickPolicyDomainOptions,
       policy_info[i]->domain);
     (void) FormatLocaleFile(file,"  Policy: %s\n",domain);
-    if ((policy_info[i]->domain == ResourcePolicyDomain) ||
+    if ((policy_info[i]->domain == CachePolicyDomain) ||
+        (policy_info[i]->domain == ResourcePolicyDomain) ||
         (policy_info[i]->domain == SystemPolicyDomain))
       {
         if (policy_info[i]->name != (char *) NULL)
@@ -823,8 +824,8 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *policy_cache,
                   file_xml=FileToXML(path,~0UL);
                   if (file_xml != (char *) NULL)
                     {
-                      status&=LoadPolicyCache(policy_cache,file_xml,path,depth+1,
-                        exception);
+                      status&=LoadPolicyCache(policy_cache,file_xml,path,
+                        depth+1,exception);
                       file_xml=DestroyString(file_xml);
                     }
                 }

diff --git a/MagickCore/policy.h b/MagickCore/policy.h
index 3ded005f28214c3db4a3eb24b0b143d6646166f0..5a216046a141dbfc3034e707891bc7220b63fbee 100644 (file)
--- a/MagickCore/policy.h
+++ b/MagickCore/policy.h
@@ -33,7 +33,8 @@ typedef enum
   FilterPolicyDomain,
   PathPolicyDomain,
   ResourcePolicyDomain,
-  SystemPolicyDomain
+  SystemPolicyDomain,
+  CachePolicyDomain
 } PolicyDomain;
 
 typedef enum

diff --git a/config/policy.xml b/config/policy.xml
index 27c05d35efc850c65a18821852053c573194030c..5ec314c46ed2f3f743fdda5a0568838c4746a548 100644 (file)
--- a/config/policy.xml
+++ b/config/policy.xml
@@ -64,5 +64,5 @@
   <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
   <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
   <!-- <policy domain="path" rights="none" pattern="@*" /> -->
-  <policy domain="cache" name="shared-secret" value="passphrase"/>
+  <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
 </policymap>