From e5644a718802c9efc0670e3f72c7c8b92098e760 Mon Sep 17 00:00:00 2001 From: Nils Maier Date: Tue, 24 Sep 2013 16:17:15 +0200 Subject: [PATCH] Revert OptionHandlerFactory changes --- src/OptionHandlerFactory.cc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc index 33e749db..eba55c70 100644 --- a/src/OptionHandlerFactory.cc +++ b/src/OptionHandlerFactory.cc @@ -792,10 +792,20 @@ std::vector OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler + OptionHandler* op( +#ifdef HAVE_APPLETLS + new DefaultOptionHandler (PREF_RPC_CERTIFICATE, TEXT_RPC_CERTIFICATE, - NO_DEFAULT_VALUE)); + NO_DEFAULT_VALUE) +#else // HAVE_APPLETLS + new LocalFilePathOptionHandler + (PREF_RPC_CERTIFICATE, + TEXT_RPC_CERTIFICATE, + NO_DEFAULT_VALUE, + false) +#endif // HAVE_APPLETLS + ); op->addTag(TAG_RPC); handlers.push_back(op); }