From 83775affe89eaa2842d22411fa4011c0c0f76938 Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Sat, 22 Dec 2012 20:13:25 -0500
Subject: [PATCH] Fix GETINFO VERSION to append AGENT conditionally.

Fixes --no-agent.
---
 src/commands.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/commands.c b/src/commands.c
index 19c9b906..8bc94f86 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -4109,20 +4109,17 @@ getinfo_command (assuan_context_t ctx, char *line)
     }
   else if (!strcasecmp (line, "version"))
     {
-      char *buf = str_asprintf ("0x%06x %s", VERSION_HEX,
+      char *buf = str_asprintf ("0x%06x %s%s", VERSION_HEX,
 #ifdef WITH_LIBACL
 				"ACL "
 #endif
 #ifdef WITH_GNUTLS
 				"GNUTLS "
 #endif
-#ifdef WITH_AGENT
-				"AGENT "
-#endif
 #ifdef WITH_QUALITY
 				"QUALITY "
 #endif
-				"");
+				"", use_agent ? "AGENT" : "");
       rc = xfer_data (ctx, buf, strlen (buf));
       xfree (buf);
     }
-- 
2.11.4.GIT