From 4fa261f8ecb16fabb4d06403f6ffacaa010ce453 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 19 May 2009 22:39:45 +0000
Subject: Fix possible system freeze on Mac OS X.

---
 scd/scdaemon.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scd/scdaemon.c')

diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 0afb5febc..49f09cf62 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -38,6 +38,7 @@
 #include <pth.h>
 
 #define JNLIB_NEED_LOG_LOGV
+#define JNLIB_NEED_AFLOCAL
 #include "scdaemon.h"
 #include <ksba.h>
 #include <gcrypt.h>
@@ -1032,8 +1033,7 @@ create_server_socket (int is_standard_name, const char *name,
   serv_addr->sun_family = AF_UNIX;
   assert (strlen (name) + 1 < sizeof (serv_addr->sun_path));
   strcpy (serv_addr->sun_path, name);
-  len = (offsetof (struct sockaddr_un, sun_path)
-	 + strlen (serv_addr->sun_path) + 1);
+  len = SUN_LEN (serv_addr);
 
   rc = assuan_sock_bind (fd, (struct sockaddr*) serv_addr, len);
   if (is_standard_name && rc == -1 && errno == EADDRINUSE)
-- 
cgit v1.2.3