Merged branch 'master' of git://github.com/sysdb/sysdb.git.

diff --git a/configure.ac b/configure.ac
index 31ec8de9e5a17546fd93eaddccbafb51af04e26f..f54868c29dd7baa71b69d8541d8cc96a066f34d4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,12 @@ AC_INIT([System DataBase],[m4_esyscmd(./version-gen.sh)],
 PACKAGE_MAINTAINER="Sebastian 'tokkee' Harl <tokkee@sysdb.io>"
 AC_DEFINE_UNQUOTED([PACKAGE_MAINTAINER], ["$PACKAGE_MAINTAINER"],
                [Define to the name of the maintainer of this package.])
+if test "x$PACKAGE_URL" = "x"; then
+       PACKAGE_URL="https://sysdb.io/"
+       AC_DEFINE_UNQUOTED([PACKAGE_URL], ["$PACKAGE_URL"],
+                       [Define to the home page for this package.])
+fi
+
 AC_CONFIG_SRCDIR([src/sysdb.c])
 AC_CONFIG_HEADERS([src/config.h])
 AC_PREFIX_DEFAULT([/opt/sysdb])

diff --git a/src/frontend/sock.c b/src/frontend/sock.c
index cf187fcb42adc4bffc229f6c20ed208105c9bde5..1f3ec5fd74b70ee903a68ce8678bd2fb69c4a87b 100644 (file)
--- a/src/frontend/sock.c
+++ b/src/frontend/sock.c
@@ -570,7 +570,11 @@ connection_handler(void *data)
                                        "connection %s to list of open connections",
                                        SDB_OBJ(conn)->name);
                }
-               write(sock->trigger[TRIGGER_WRITE], "", 1);
+               if (write(sock->trigger[TRIGGER_WRITE], "", 1) <= 0) {
+                       /* This shouldn't happen and it's not critical; in the worst cases
+                        * it slows us down. */
+                       sdb_log(SDB_LOG_WARNING, "frontend: Failed to trigger main loop");
+               }
 
                /* pass ownership back to list; or destroy in case of an error */
                sdb_object_deref(SDB_OBJ(conn));

diff --git a/t/valgrind.suppress b/t/valgrind.suppress
index 67d05fda0031ae646ecce5daff6076a6c1f38688..66a1e6336c57832e97713410dbd9dbe88de54d51 100644 (file)
--- a/t/valgrind.suppress
+++ b/t/valgrind.suppress
@@ -39,6 +39,24 @@
    fun:dl_open_worker
    ...
 }
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Value8
+   obj:/usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.0
+   ...
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Value8
+   obj:/usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.0
+   ...
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   obj:/usr/lib/x86_64-linux-gnu/libssl.so.1.0.0
+   ...
+}
 {
    <insert_a_suppression_name_here>
    Memcheck:Cond
@@ -46,3 +64,92 @@
    fun:ASN1_item_ex_d2i
    ...
 }
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Param
+   write(buf)
+   ...
+   fun:BIO_write
+   ...
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   ...
+   fun:BN_mod_mul
+   ...
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   ...
+   fun:BN_mul
+   ...
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   ...
+   fun:BN_div
+   ...
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   ...
+   fun:BN_add
+   ...
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   ...
+   fun:BN_sub
+   ...
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   ...
+   fun:BN_mod_exp_mont_consttime
+   ...
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   ...
+   fun:BN_mod_exp_mont
+   ...
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   fun:memset
+   fun:BUF_MEM_grow_clean
+   ...
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   ...
+   fun:RSA_sign
+   ...
+   fun:EVP_SignFinal
+   ...
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Value8
+   ...
+   fun:RSA_sign
+   ...
+   fun:EVP_SignFinal
+   ...
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Cond
+   ...
+   fun:RSA_padding_check_PKCS1_type_2
+   ...
+}