# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1298900358 0
# Node ID 810dfc792ca99fb8365d9323ccd475872b2d20c9
# Parent  3aa74a4d83ae6b16f99cf60fc2060e02265b9619
Compile fix for when both client and server agent forwarding is disabled

diff -r 3aa74a4d83ae -r 810dfc792ca9 options.h
--- a/options.h	Sun Feb 27 13:57:32 2011 +0000
+++ b/options.h	Mon Feb 28 13:39:18 2011 +0000
@@ -64,7 +64,7 @@
 #define ENABLE_SVR_LOCALTCPFWD
 #define ENABLE_SVR_REMOTETCPFWD
 
-/* Enable Authentication Agent Forwarding - server only for now */
+/* Enable Authentication Agent Forwarding */
 #define ENABLE_SVR_AGENTFWD
 #define ENABLE_CLI_AGENTFWD
 
diff -r 3aa74a4d83ae -r 810dfc792ca9 svr-agentfwd.c
--- a/svr-agentfwd.c	Sun Feb 27 13:57:32 2011 +0000
+++ b/svr-agentfwd.c	Mon Feb 28 13:39:18 2011 +0000
@@ -27,7 +27,7 @@
 
 #include "includes.h"
 
-#ifndef DISABLE_AGENTFWD
+#ifdef ENABLE_SVR_AGENTFWD
 
 #include "agentfwd.h"
 #include "session.h"
diff -r 3aa74a4d83ae -r 810dfc792ca9 svr-chansession.c
--- a/svr-chansession.c	Sun Feb 27 13:57:32 2011 +0000
+++ b/svr-chansession.c	Mon Feb 28 13:39:18 2011 +0000
@@ -240,7 +240,7 @@
 	chansess->x11authcookie = NULL;
 #endif
 
-#ifndef DISABLE_AGENTFWD
+#ifdef ENABLE_AGENTFWD
 	chansess->agentlistener = NULL;
 	chansess->agentfile = NULL;
 	chansess->agentdir = NULL;
@@ -293,7 +293,7 @@
 	x11cleanup(chansess);
 #endif
 
-#ifndef DISABLE_AGENTFWD
+#ifdef ENABLE_AGENTFWD
 	svr_agentcleanup(chansess);
 #endif
 
@@ -351,7 +351,7 @@
 	} else if (strcmp(type, "x11-req") == 0) {
 		ret = x11req(chansess);
 #endif
-#ifndef DISABLE_AGENTFWD
+#ifdef ENABLE_AGENTFWD
 	} else if (strcmp(type, "auth-agent-req@openssh.com") == 0) {
 		ret = svr_agentreq(chansess);
 #endif
@@ -937,7 +937,7 @@
 	/* set up X11 forwarding if enabled */
 	x11setauth(chansess);
 #endif
-#ifndef DISABLE_AGENTFWD
+#ifdef ENABLE_AGENTFWD
 	/* set up agent env variable */
 	svr_agentset(chansess);
 #endif
diff -r 3aa74a4d83ae -r 810dfc792ca9 sysoptions.h
--- a/sysoptions.h	Sun Feb 27 13:57:32 2011 +0000
+++ b/sysoptions.h	Mon Feb 28 13:39:18 2011 +0000
@@ -162,6 +162,10 @@
 #define USING_LISTENERS
 #endif
 
+#if defined(ENABLE_SVR_AGENTFWD) || defined(ENABLE_CLI_LOCALTCPFWD)
+#define ENABLE_AGENTFWD
+#endif
+
 #if defined(ENABLE_CLI_NETCAT) && defined(ENABLE_CLI_PROXYCMD)
 #define ENABLE_CLI_MULTIHOP
 #endif