ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-01-31 10:57:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compile fix for when both client and server agent forwarding is disabled

Browse Source 
--HG--
extra : convert_revision : 8a608f0ed5e4b491dba4bf330e560636ec7376fd
This commit is contained in:
Matt Johnston 2011-02-28 13:39:18 +00:00
parent 3c42c5407c
commit 53fc7eaf03
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
options.h
View File

@ -64,7 +64,7 @@ much traffic. */
#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

2
svr-agentfwd.c
View File

@ -27,7 +27,7 @@
#include "includes.h"
#ifndef DISABLE_AGENTFWD
#ifdef ENABLE_SVR_AGENTFWD
#include "agentfwd.h"
#include "session.h"

8
svr-chansession.c
View File

@ -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

4
sysoptions.h
View File

@ -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