Don't use library locks from p11-kit tool
authorStef Walter <stefw@gnome.org>
Tue, 2 Apr 2013 16:33:12 +0000 (18:33 +0200)
committerStef Walter <stefw@gnome.org>
Wed, 3 Apr 2013 08:39:09 +0000 (10:39 +0200)
The global library p11_library_mutex is for libraries to use, so don't
use it from any code in common/, which is also used by the p11-kit tool

https://bugs.freedesktop.org/show_bug.cgi?id=63046

common/library.c
p11-kit/util.c

index e4512a13df9915b0f08bb439f82bb940992c34d2..71dd3b9af9ce39b41d6c9c150332b14a31a89874 100644 (file)
@@ -111,17 +111,13 @@ p11_message (const char* msg,
 void
 p11_message_quiet (void)
 {
-       p11_lock ();
        print_messages = false;
-       p11_unlock ();
 }
 
 void
 p11_message_loud (void)
 {
-       p11_lock ();
        print_messages = true;
-       p11_unlock ();
 }
 
 const char*
index 62aa7d2e03be157f04df68b7077bb81a38a4bd93..bb074ac10f6dfc545a0cdb47b4347c49ab9e64f2 100644 (file)
@@ -141,8 +141,10 @@ p11_kit_space_strdup (const unsigned char *string, size_t max_length)
 void
 p11_kit_be_quiet (void)
 {
+       p11_lock ();
        p11_message_quiet ();
        p11_debug_init ();
+       p11_unlock ();
 }
 
 /**
@@ -154,8 +156,10 @@ p11_kit_be_quiet (void)
 void
 p11_kit_be_loud (void)
 {
+       p11_lock ();
        p11_message_loud ();
        p11_debug_init ();
+       p11_unlock ();
 }
 
 /**