Mercurial > dropbear
comparison svr-chansession.c @ 560:52d7301e46bd agent-client
Agent forwarding works
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Thu, 30 Jul 2009 15:14:33 +0000 |
parents | d4bbc0039008 |
children | b321aeb57c64 |
comparison
equal
deleted
inserted
replaced
559:7f66b8e40f2d | 560:52d7301e46bd |
---|---|
285 #ifndef DISABLE_X11FWD | 285 #ifndef DISABLE_X11FWD |
286 x11cleanup(chansess); | 286 x11cleanup(chansess); |
287 #endif | 287 #endif |
288 | 288 |
289 #ifndef DISABLE_AGENTFWD | 289 #ifndef DISABLE_AGENTFWD |
290 agentcleanup(chansess); | 290 svr_agentcleanup(chansess); |
291 #endif | 291 #endif |
292 | 292 |
293 /* clear child pid entries */ | 293 /* clear child pid entries */ |
294 for (i = 0; i < svr_ses.childpidsize; i++) { | 294 for (i = 0; i < svr_ses.childpidsize; i++) { |
295 if (svr_ses.childpids[i].chansess == chansess) { | 295 if (svr_ses.childpids[i].chansess == chansess) { |
344 } else if (strcmp(type, "x11-req") == 0) { | 344 } else if (strcmp(type, "x11-req") == 0) { |
345 ret = x11req(chansess); | 345 ret = x11req(chansess); |
346 #endif | 346 #endif |
347 #ifndef DISABLE_AGENTFWD | 347 #ifndef DISABLE_AGENTFWD |
348 } else if (strcmp(type, "[email protected]") == 0) { | 348 } else if (strcmp(type, "[email protected]") == 0) { |
349 ret = agentreq(chansess); | 349 ret = svr_agentreq(chansess); |
350 #endif | 350 #endif |
351 } else if (strcmp(type, "signal") == 0) { | 351 } else if (strcmp(type, "signal") == 0) { |
352 ret = sessionsignal(chansess); | 352 ret = sessionsignal(chansess); |
353 } else { | 353 } else { |
354 /* etc, todo "env", "subsystem" */ | 354 /* etc, todo "env", "subsystem" */ |
892 /* set up X11 forwarding if enabled */ | 892 /* set up X11 forwarding if enabled */ |
893 x11setauth(chansess); | 893 x11setauth(chansess); |
894 #endif | 894 #endif |
895 #ifndef DISABLE_AGENTFWD | 895 #ifndef DISABLE_AGENTFWD |
896 /* set up agent env variable */ | 896 /* set up agent env variable */ |
897 agentset(chansess); | 897 svr_agentset(chansess); |
898 #endif | 898 #endif |
899 | 899 |
900 usershell = m_strdup(get_user_shell()); | 900 usershell = m_strdup(get_user_shell()); |
901 run_shell_command(chansess->cmd, ses.maxfd, usershell); | 901 run_shell_command(chansess->cmd, ses.maxfd, usershell); |
902 | 902 |