Mercurial > dropbear

comparison svr-chansession.c @ 604:810dfc792ca9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Compile fix for when both client and server agent forwarding is disabled
author Matt Johnston <matt@ucc.asn.au>
date Mon, 28 Feb 2011 13:39:18 +0000
parents a98a2138364a
children 306a907d23e7
comparison
equal deleted inserted replaced
603:3aa74a4d83ae 604:810dfc792ca9
238 chansess->x11listener = NULL; 238 chansess->x11listener = NULL;
239 chansess->x11authprot = NULL; 239 chansess->x11authprot = NULL;
240 chansess->x11authcookie = NULL; 240 chansess->x11authcookie = NULL;
241 #endif 241 #endif
242 242
243 #ifndef DISABLE_AGENTFWD 243 #ifdef ENABLE_AGENTFWD
244 chansess->agentlistener = NULL; 244 chansess->agentlistener = NULL;
245 chansess->agentfile = NULL; 245 chansess->agentfile = NULL;
246 chansess->agentdir = NULL; 246 chansess->agentdir = NULL;
247 #endif 247 #endif
248 248
291 291
292 #ifndef DISABLE_X11FWD 292 #ifndef DISABLE_X11FWD
293 x11cleanup(chansess); 293 x11cleanup(chansess);
294 #endif 294 #endif
295 295
296 #ifndef DISABLE_AGENTFWD 296 #ifdef ENABLE_AGENTFWD
297 svr_agentcleanup(chansess); 297 svr_agentcleanup(chansess);
298 #endif 298 #endif
299 299
300 /* clear child pid entries */ 300 /* clear child pid entries */
301 for (i = 0; i < svr_ses.childpidsize; i++) { 301 for (i = 0; i < svr_ses.childpidsize; i++) {
349 ret = sessioncommand(channel, chansess, 1, 1); 349 ret = sessioncommand(channel, chansess, 1, 1);
350 #ifndef DISABLE_X11FWD 350 #ifndef DISABLE_X11FWD
351 } else if (strcmp(type, "x11-req") == 0) { 351 } else if (strcmp(type, "x11-req") == 0) {
352 ret = x11req(chansess); 352 ret = x11req(chansess);
353 #endif 353 #endif
354 #ifndef DISABLE_AGENTFWD 354 #ifdef ENABLE_AGENTFWD
355 } else if (strcmp(type, "[email protected]") == 0) { 355 } else if (strcmp(type, "[email protected]") == 0) {
356 ret = svr_agentreq(chansess); 356 ret = svr_agentreq(chansess);
357 #endif 357 #endif
358 } else if (strcmp(type, "signal") == 0) { 358 } else if (strcmp(type, "signal") == 0) {
359 ret = sessionsignal(chansess); 359 ret = sessionsignal(chansess);
935 935
936 #ifndef DISABLE_X11FWD 936 #ifndef DISABLE_X11FWD
937 /* set up X11 forwarding if enabled */ 937 /* set up X11 forwarding if enabled */
938 x11setauth(chansess); 938 x11setauth(chansess);
939 #endif 939 #endif
940 #ifndef DISABLE_AGENTFWD 940 #ifdef ENABLE_AGENTFWD
941 /* set up agent env variable */ 941 /* set up agent env variable */
942 svr_agentset(chansess); 942 svr_agentset(chansess);
943 #endif 943 #endif
944 944
945 usershell = m_strdup(get_user_shell()); 945 usershell = m_strdup(get_user_shell());