summaryrefslogtreecommitdiffhomepage
path: root/svr-chansession.c
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2011-02-28 13:39:18 +0000
committerMatt Johnston <matt@ucc.asn.au>2011-02-28 13:39:18 +0000
commit53fc7eaf03d039dee4da8491856a77f31beb8854 (patch)
tree546c41c171319dacc1f40f060745c7070e87785e /svr-chansession.c
parent3c42c5407cfef441dfa53b1797b41b9f66707f74 (diff)
Compile fix for when both client and server agent forwarding is disabled
--HG-- extra : convert_revision : 8a608f0ed5e4b491dba4bf330e560636ec7376fd
Diffstat (limited to 'svr-chansession.c')
-rw-r--r--svr-chansession.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/svr-chansession.c b/svr-chansession.c
index 1b5fcc6..a914f25 100644
--- a/svr-chansession.c
+++ b/svr-chansession.c
@@ -240,7 +240,7 @@ static int newchansess(struct Channel *channel) {
chansess->x11authcookie = NULL;
#endif
-#ifndef DISABLE_AGENTFWD
+#ifdef ENABLE_AGENTFWD
chansess->agentlistener = NULL;
chansess->agentfile = NULL;
chansess->agentdir = NULL;
@@ -293,7 +293,7 @@ static void closechansess(struct Channel *channel) {
x11cleanup(chansess);
#endif
-#ifndef DISABLE_AGENTFWD
+#ifdef ENABLE_AGENTFWD
svr_agentcleanup(chansess);
#endif
@@ -351,7 +351,7 @@ static void chansessionrequest(struct Channel *channel) {
} 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 @@ static void execchild(void *user_data) {
/* set up X11 forwarding if enabled */
x11setauth(chansess);
#endif
-#ifndef DISABLE_AGENTFWD
+#ifdef ENABLE_AGENTFWD
/* set up agent env variable */
svr_agentset(chansess);
#endif