* agent.h (out_of_core): s/__inline__/inine. Noted by Ray Link.

* dynload.h: s/__inline__/inline/.

* tlv.c [GNUPG_MAJOR_VERSION==1]: Define constants instead of
including a gnupg 1.4 header.

* watchgnupg.c: Make sure that PF_LCOAL and AF_LOCAL are defines.
Noted by Ray Link.

11 files changed, 60 insertions, 9 deletions

diff --git a/THANKS b/THANKS
index e1424cab1..57add954b 100644
--- a/THANKS
+++ b/THANKS
@@ -3,4 +3,5 @@ Alexander Belopolsky      belopolsky at mac.com
 Andrew J. Schorr          aschorr at telemetry-investments.com
 Kazu Yamamoto             kazu@iij.ad.jp
 Michael Nottebrock        michaelnottebrock at gmx.net
+Ray Link                  rlink at pitt.edu
 Richard Lefebvre          rick at cerca.umontreal.ca
diff --git a/agent/ChangeLog b/agent/ChangeLog
index dcf0cdfd3..86f62be48 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-31  Werner Koch  <wk@g10code.com>
+
+	* agent.h (out_of_core): s/__inline__/inine.  Noted by Ray Link.
+
+2005-05-25  Werner Koch  <wk@g10code.com>
+
+	* gpg-agent.c (main): Do not unset the DISPLAY when we are
+	continuing as child.
+
 2005-05-24  Werner Koch  <wk@g10code.com>
 
 	* call-scd.c (inq_needpin): Skip leading spaces in of PIN
diff --git a/agent/agent.h b/agent/agent.h
index e416914cf..a667c0d46 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -37,7 +37,7 @@
 
 /* Convenience function to be used instead of returning the old
    GNUPG_Out_Of_Core. */
-static __inline__ gpg_error_t
+static inline gpg_error_t
 out_of_core (void)
 {
   return gpg_error (gpg_err_code_from_errno (errno));
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index e3e952906..c793e7eab 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -490,7 +490,7 @@ main (int argc, char **argv )
 
   opt.homedir = default_homedir ();
 
-  /* Record the some original Denvironment settings. */
+  /* Record some of the original environment strings. */
   opt.startup_display = getenv ("DISPLAY");
   if (opt.startup_display)
     opt.startup_display = xstrdup (opt.startup_display);
@@ -776,9 +776,11 @@ main (int argc, char **argv )
       /* Remove the DISPLAY variable so that a pinentry does not
          default to a specific display.  There is still a default
          display when gpg-agent was started using --display or a
-         client requested this using an OPTION command. */
+         client requested this using an OPTION command.  Note, that we
+         don't do this when running in reverse daemon mode (i.e. when
+         exec the program given as arguments). */
 #ifndef HAVE_W32_SYSTEM
-      if (!opt.keep_display)
+      if (!opt.keep_display && !argc)
         unsetenv ("DISPLAY");
 #endif
 
diff --git a/common/ChangeLog b/common/ChangeLog
index cf294fbd1..abb3c6427 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-31  Werner Koch  <wk@g10code.com>
+
+	* dynload.h: s/__inline__/inline/.
+
 2005-05-13  Werner Koch  <wk@g10code.com>
 
 	* signal.c (got_fatal_signal): Print the signal number if we can't
diff --git a/common/dynload.h b/common/dynload.h
index 3c4652091..2c074141f 100644
--- a/common/dynload.h
+++ b/common/dynload.h
@@ -27,14 +27,14 @@
 
 #define RTLD_LAZY 0
 
-static __inline__ void *
+static inline void *
 dlopen (const char * name, int flag)
 {
   void * hd = LoadLibrary (name);
   return hd;
 }
 
-static __inline__ void *
+static inline void *
 dlsym (void *hd, const char *sym)
 {
   if (hd && sym)
@@ -48,7 +48,7 @@ dlsym (void *hd, const char *sym)
 }
 
 
-static __inline__ const char *
+static inline const char *
 dlerror (void)
 {
   static char buf[32];
@@ -57,7 +57,7 @@ dlerror (void)
 }
 
 
-static __inline__ int
+static inline int
 dlclose (void * hd)
 {
   if (hd)
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 64a4a8b72..ea1b0d287 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,13 @@
+2005-05-31  Werner Koch  <wk@g10code.com>
+
+	* tlv.c [GNUPG_MAJOR_VERSION==1]: Define constants instead of
+	including a gnupg 1.4 header.
+
+2005-05-30  Werner Koch  <wk@g10code.com>
+
+	* tlv.c: Add hack to compile without gpg-error.h when used with
+	GnuPG 1.4.
+
 2005-05-23  Werner Koch  <wk@g10code.com>
 
 	* Makefile.am: Do not build sc-copykeys anymore.
diff --git a/scd/app-common.h b/scd/app-common.h
index 613ad61f6..812736ece 100644
--- a/scd/app-common.h
+++ b/scd/app-common.h
@@ -45,7 +45,7 @@ struct app_ctx_s {
      in case we need to divert the operation to an already running
      agent.  This if ASSUAN_CTX is not NULL we take this as indication
      that all operations are diverted to gpg-agent. */
-#if GNUPG_MAJOR_VERSION == 1 && defined(ENABLE_AGENT_SUPPORT)
+#if GNUPG_MAJOR_VERSION == 1
   assuan_context_t assuan_ctx;
 #endif /*GNUPG_MAJOR_VERSION == 1*/
 
diff --git a/scd/tlv.c b/scd/tlv.c
index b5dcd4021..b436d956a 100644
--- a/scd/tlv.c
+++ b/scd/tlv.c
@@ -25,7 +25,15 @@
 #include <string.h>
 #include <assert.h>
 
+#if GNUPG_MAJOR_VERSION == 1
+#define GPG_ERR_EOF               (-1)
+#define GPG_ERR_BAD_BER           (1)  /*G10ERR_GENERAL*/
+#define GPG_ERR_INV_SEXP          (45) /*G10ERR_INV_ARG*/
+typedef int gpg_error_t;
+#define gpg_error(n) (n)
+#else
 #include <gpg-error.h>
+#endif
 
 #include "tlv.h"
 
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 085ba094f..103be28e5 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-31  Werner Koch  <wk@g10code.com>
+
+	* watchgnupg.c: Make sure that PF_LCOAL and AF_LOCAL are defines.
+	Noted by Ray Link.
+
 2005-05-28  Moritz Schulte  <moritz@g10code.com>
 
 	* gpgkey2ssh.c: New file.
diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
index 50f9d7274..25ca8c413 100644
--- a/tools/watchgnupg.c
+++ b/tools/watchgnupg.c
@@ -45,6 +45,18 @@
 #define BUGREPORT_LINE ""
 #endif
 
+#ifndef PF_LOCAL
+# ifdef PF_UNIX
+#  define PF_LOCAL PF_UNIX
+# else
+#  define PF_LOCAL AF_UNIX
+# endif
+# ifndef AF_LOCAL
+#  define AF_LOCAL AF_UNIX
+# endif
+#endif
+
+
 static int verbose;