X-Git-Url: https://git.saurik.com/apple/libsecurity_codesigning.git/blobdiff_plain/2e2533baea112414a307d169c101a9c225fd1d77..f60086fcc38b96c965d923d8ba057d01d516f6d1:/lib/reqparser.cpp

diff --git a/lib/reqparser.cpp b/lib/reqparser.cpp
index e419f35..5a8e94e 100644
--- a/lib/reqparser.cpp
+++ b/lib/reqparser.cpp
@@ -27,6 +27,7 @@
 #include "reqparser.h"
 #include "antlrplugin.h"
 #include "cserror.h"
+#include "codesigning_dtrace.h"
 #include <CoreFoundation/CoreFoundation.h>
 #include <security_utilities/osxcode.h>
 
@@ -50,12 +51,11 @@ ModuleNexus<PluginHost> plugin;
 PluginHost::PluginHost()
 {
 	if (CFBundleRef securityFramework = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.security")))
-		if (CFURLRef plugins = CFBundleCopyBuiltInPlugInsURL(securityFramework))
-			if (CFRef<CFURLRef> pluginURL = CFURLCreateWithFileSystemPathRelativeToBase(NULL,
-					CFSTR("csparser.bundle"), kCFURLPOSIXPathStyle, true, plugins)) {
-				secdebug("antlrplugin", "loading antlr parser plugin from %s", cfString(pluginURL).c_str());
+		if (CFRef<CFURLRef> plugins = CFBundleCopyBuiltInPlugInsURL(securityFramework))
+			if (CFRef<CFURLRef> pluginURL = makeCFURL("csparser.bundle", true, plugins)) {
 				plugin = new LoadableBundle(cfString(pluginURL).c_str());
 				plugin->load();
+				CODESIGN_LOAD_ANTLR();
 				antlr = reinterpret_cast<FindAntlrPlugin *>(plugin->lookupSymbol(FINDANTLRPLUGIN))();
 				return;
 			}