Code

bts832577-gcry-control.patch: Add missing return statement.
authorSebastian Harl <sh@tokkee.org>
Thu, 28 Jul 2016 21:56:46 +0000 (23:56 +0200)
committerSebastian Harl <sh@tokkee.org>
Thu, 28 Jul 2016 21:56:46 +0000 (23:56 +0200)
This got lost when updating the patch.

debian/patches/bts832577-gcry-control.patch

index 14b803fbf1ef95be2359c95a5a78a7641e9d93ed..b4e324a5295c32af16b7fecb2164c4400f20a0fd 100644 (file)
@@ -35,7 +35,7 @@ diff a/src/network.c b/src/network.c
    }
  # endif
  
-@@ -530,11 +530,11 @@
+@@ -530,11 +530,12 @@
    if (err)
    {
      ERROR ("network plugin: gcry_control (GCRYCTL_SET_THREAD_CBS) failed: %s", gcry_strerror (err));
@@ -45,11 +45,12 @@ diff a/src/network.c b/src/network.c
  
    gcry_control (GCRYCTL_INITIALIZATION_FINISHED);
 -} /* }}} void network_init_gcrypt */
++  return (0);
 +} /* }}} int network_init_gcrypt */
  
  static gcry_cipher_hd_t network_get_aes256_cypher (sockent_t *se, /* {{{ */
      const void *iv, size_t iv_size, const char *username)
-@@ -2077,7 +2077,12 @@
+@@ -2077,7 +2078,12 @@
        {
                if (se->data.client.security_level > SECURITY_LEVEL_NONE)
                {
@@ -63,7 +64,7 @@ diff a/src/network.c b/src/network.c
  
                        if ((se->data.client.username == NULL)
                                        || (se->data.client.password == NULL))
-@@ -2097,7 +2102,12 @@
+@@ -2097,7 +2103,12 @@
        {
                if (se->data.server.security_level > SECURITY_LEVEL_NONE)
                {
@@ -77,7 +78,7 @@ diff a/src/network.c b/src/network.c
  
                        if (se->data.server.auth_file == NULL)
                        {
-@@ -3548,7 +3558,11 @@
+@@ -3548,7 +3559,11 @@
        have_init = 1;
  
  #if HAVE_LIBGCRYPT