Security-58286.20.16.tar.gz

[apple/security.git] / OSX / libsecurity_codesigning / lib / resources.cpp

diff --git a/OSX/libsecurity_codesigning/lib/resources.cpp b/OSX/libsecurity_codesigning/lib/resources.cpp
index 4c36a38716f374b48ceb4d1342fdc406747dcc93..25ddade7c61798bda60707492b63fc6a445658b8 100644 (file)
--- a/OSX/libsecurity_codesigning/lib/resources.cpp
+++ b/OSX/libsecurity_codesigning/lib/resources.cpp
@@ -260,6 +260,13 @@ ResourceBuilder::Rule *ResourceBuilder::findRule(string path) const
                        }
                        if (!bestRule || rule->weight > bestRule->weight)
                                bestRule = rule;
                        }
                        if (!bestRule || rule->weight > bestRule->weight)
                                bestRule = rule;

+
+
+#if TARGET_OS_WATCH
+/* rdar://problem/30517969 */
+                       if (bestRule && bestRule->weight == rule->weight && !(bestRule->flags & omitted) && (rule->flags & omitted))
+                               bestRule = rule;
+#endif

                }
        }
        secinfo("rscan", "choosing %s (%d,0x%x)",
                }
        }
        secinfo("rscan", "choosing %s (%d,0x%x)",