use warning messages for failing to enumerate store
This commit is contained in:
parent
c45db11df9
commit
31c3dae84f
36
softhsm-v2.2.0-no-stderr.patch
Normal file
36
softhsm-v2.2.0-no-stderr.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp
|
||||||
|
index 2e5504a..b857418 100644
|
||||||
|
--- a/src/lib/SoftHSM.cpp
|
||||||
|
+++ b/src/lib/SoftHSM.cpp
|
||||||
|
@@ -474,7 +474,7 @@ CK_RV SoftHSM::C_Initialize(CK_VOID_PTR pInitArgs)
|
||||||
|
objectStore = new ObjectStore(Configuration::i()->getString("directories.tokendir", DEFAULT_TOKENDIR));
|
||||||
|
if (!objectStore->isValid())
|
||||||
|
{
|
||||||
|
- ERROR_MSG("Could not load the object store");
|
||||||
|
+ WARNING_MSG("Could not load the object store");
|
||||||
|
delete objectStore;
|
||||||
|
objectStore = NULL;
|
||||||
|
delete sessionObjectStore;
|
||||||
|
diff --git a/src/lib/common/softhsm2.conf.in b/src/lib/common/softhsm2.conf.in
|
||||||
|
index b208cb6..bd0a60b 100644
|
||||||
|
--- a/src/lib/common/softhsm2.conf.in
|
||||||
|
+++ b/src/lib/common/softhsm2.conf.in
|
||||||
|
@@ -4,4 +4,4 @@ directories.tokendir = @softhsmtokendir@
|
||||||
|
objectstore.backend = file
|
||||||
|
|
||||||
|
# ERROR, WARNING, INFO, DEBUG
|
||||||
|
-log.level = INFO
|
||||||
|
+log.level = ERROR
|
||||||
|
diff --git a/src/lib/object_store/ObjectStore.cpp b/src/lib/object_store/ObjectStore.cpp
|
||||||
|
index 171cede..3cde15f 100644
|
||||||
|
--- a/src/lib/object_store/ObjectStore.cpp
|
||||||
|
+++ b/src/lib/object_store/ObjectStore.cpp
|
||||||
|
@@ -56,7 +56,7 @@ ObjectStore::ObjectStore(std::string inStorePath)
|
||||||
|
|
||||||
|
if (!storeDir.isValid())
|
||||||
|
{
|
||||||
|
- ERROR_MSG("Failed to enumerate object store in %s", storePath.c_str());
|
||||||
|
+ WARNING_MSG("Failed to enumerate object store in %s", storePath.c_str());
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
@ -11,6 +11,8 @@ Source1: http://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}
|
|||||||
# taken from coolkey which is not build on all arches we build on
|
# taken from coolkey which is not build on all arches we build on
|
||||||
Source3: softhsm2-pk11install.c
|
Source3: softhsm2-pk11install.c
|
||||||
|
|
||||||
|
Patch0: softhsm-v2.2.0-no-stderr.patch
|
||||||
|
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
BuildRequires: openssl-devel >= 1.0.1k-6, sqlite-devel >= 3.4.2, cppunit-devel
|
BuildRequires: openssl-devel >= 1.0.1k-6, sqlite-devel >= 3.4.2, cppunit-devel
|
||||||
BuildRequires: gcc-c++, pkgconfig, p11-kit-devel, nss-devel
|
BuildRequires: gcc-c++, pkgconfig, p11-kit-devel, nss-devel
|
||||||
@ -44,6 +46,8 @@ The devel package contains the libsofthsm include files
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}%{?prever}
|
%setup -q -n %{name}-%{version}%{?prever}
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%if 0%{?prever:1}
|
%if 0%{?prever:1}
|
||||||
autoreconf -fiv
|
autoreconf -fiv
|
||||||
%endif
|
%endif
|
||||||
|
Loading…
Reference in New Issue
Block a user