mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Fix possible system freeze on Mac OS X.
This commit is contained in:
parent
98f10d74b8
commit
4fa261f8ec
14 changed files with 73 additions and 28 deletions
|
@ -1,3 +1,8 @@
|
|||
2009-05-19 Werner Koch <wk@g10code.com>
|
||||
|
||||
* scdaemon.c (create_server_socket): Use SUN_LEN.
|
||||
(JNLIB_NEED_AFLOCAL): Define.
|
||||
|
||||
2009-05-13 Werner Koch <wk@g10code.com>
|
||||
|
||||
* ccid-driver.c (abort_cmd): Add arg SEQNO and change callers.
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue