From 5501e6b64fb6ea44d8d549b076fc13078c7d5b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 2 Jan 2013 01:07:53 +0100
Subject: [PATCH] daemon: Properly initialize libgcrypt.
* nix/nix-daemon/guix-daemon.cc (main): Call `gcry_check_version'.
---
nix/nix-daemon/guix-daemon.cc | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc
index 6ffc8f04ad6..823eeb674e5 100644
--- a/nix/nix-daemon/guix-daemon.cc
+++ b/nix/nix-daemon/guix-daemon.cc
@@ -1,5 +1,5 @@
/* Guix --- Nix package management from Guile. -*- coding: utf-8 -*-
- Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org>
+ Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org>
This file is part of Guix.
@@ -23,6 +23,8 @@
#include <globals.hh>
#include <util.hh>
+#include <gcrypt.h>
+
#include <stdlib.h>
#include <argp.h>
#include <unistd.h>
@@ -165,6 +167,13 @@ main (int argc, char *argv[])
{
Strings nothing;
+ /* Initialize libgcrypt. */
+ if (!gcry_check_version (GCRYPT_VERSION))
+ {
+ fprintf (stderr, "error: libgcrypt version mismatch\n");
+ exit (EXIT_FAILURE);
+ }
+
#ifdef HAVE_CHROOT
settings.useChroot = true;
#else
--
GitLab