aboutsummaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
Diffstat (limited to 'agent')
-rw-r--r--agent/ChangeLog8
-rw-r--r--agent/call-scd.c1
-rw-r--r--agent/preset-passphrase.c9
3 files changed, 16 insertions, 2 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 0db76684a..714ce15cc 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-13 Werner Koch <[email protected]>
+
+ * preset-passphrase.c (main) [W32]: Check for WSAStartup error.
+
+2006-09-08 Werner Koch <[email protected]>
+
+ * call-scd.c: Add signal.h as we are referencing SIGUSR2.
+
2006-09-06 Marcus Brinkmann <[email protected]>
* Makefile.am (AM_CFLAGS): Add $(GPG_ERR_CFLAGS).
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 3dc869137..1c22ab364 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -27,6 +27,7 @@
#include <ctype.h>
#include <assert.h>
#include <unistd.h>
+#include <signal.h>
#include <sys/stat.h>
#include <sys/types.h>
#ifndef HAVE_W32_SYSTEM
diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c
index 8f8f60e76..1b54248a5 100644
--- a/agent/preset-passphrase.c
+++ b/agent/preset-passphrase.c
@@ -281,10 +281,15 @@ main (int argc, char **argv)
#ifdef HAVE_W32_SYSTEM
/* Fixme: Need to initialize the Windows sockets: This should be
moved to another place and we should make sure that it won't get
- doen twice, like when Pth is used too. */
+ done twice, like when Pth is used too. */
{
WSADATA wsadat;
- WSAStartup (0x202, &wsadat);
+ if (WSAStartup (0x202, &wsadat) )
+ {
+ log_error ("error initializing socket library: ec=%d\n",
+ (int)WSAGetLastError () );
+ return 2;
+ }
}
#endif