Fix possible system freeze on Mac OS X.

common/ChangeLog

@@ -1,3 +1,8 @@
+2009-05-19  Werner Koch  <wk@g10code.com>
+
+	* simple-pwquery.c (agent_open): Use SUN_LEN
+	(JNLIB_NEED_AFLOCAL): Define and include mischelp.h.
+
 2009-05-07  Werner Koch  <wk@g10code.com>
 
 	* sexputil.c (get_rsa_pk_from_canon_sexp): New.

common/simple-pwquery.c

@@ -39,6 +39,9 @@
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
+
+#define JNLIB_NEED_AFLOCAL
+#include "../jnlib/mischelp.h"
 #ifdef HAVE_W32_SYSTEM
 #include "../jnlib/w32-afunix.h"
 #endif
@@ -379,8 +382,7 @@ agent_open (int *rfd)
   memset (&client_addr, 0, sizeof client_addr);
   client_addr.sun_family = AF_UNIX;
   strcpy (client_addr.sun_path, infostr);
-  len = (offsetof (struct sockaddr_un, sun_path)
-         + strlen(client_addr.sun_path) + 1);
+  len = SUN_LEN (&client_addr);
     
 #ifdef HAVE_W32_SYSTEM       
   rc = _w32_sock_connect (fd, (struct sockaddr*)&client_addr, len );

common/sysutils.h

@@ -56,7 +56,4 @@ void gnupg_allow_set_foregound_window (pid_t pid);
 
 #endif /*HAVE_W32_SYSTEM*/
 
-
-
-
 #endif /*GNUPG_COMMON_SYSUTILS_H*/