From 748a20879674907d813fad000d0774e82fb519a2 Mon Sep 17 00:00:00 2001
From: Julien BLACHE <jb@jblache.org>
Date: Wed, 15 Sep 2010 18:05:20 +0200
Subject: [PATCH] Fix gcrypt_init_fail error path

Set ret to EXIT_FAILURE and swap the gcrypt_init_fail and signal_block_fail
labels so they appear in the correct (reverse) order. No impact.
---
 src/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main.c b/src/main.c
index da4bd796..e4300e46 100644
--- a/src/main.c
+++ b/src/main.c
@@ -566,6 +566,7 @@ main(int argc, char **argv)
     {
       DPRINTF(E_FATAL, L_MAIN, "libgcrypt version mismatch\n");
 
+      ret = EXIT_FAILURE;
       goto gcrypt_init_fail;
     }
 
@@ -785,8 +786,8 @@ main(int argc, char **argv)
 	}
     }
 
- gcrypt_init_fail:
  signal_block_fail:
+ gcrypt_init_fail:
   DPRINTF(E_LOG, L_MAIN, "Exiting.\n");
   conffile_unload();
   logger_deinit();