Mercurial > dropbear

comparison svr-chansession.c @ 668:405418f7dc5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed compilation with unset ENABLE_{SVR,CLI}_AGENTFWD. Got rid of ENABLE_AGENTFWD macro.
author Andrey Mazo <ahippo@yandex.ru>
date Mon, 26 Mar 2012 16:17:16 +0400
parents fc7ae88e63b3
children 167fdc091c05
comparison
equal deleted inserted replaced
667:fc7ae88e63b3 668:405418f7dc5e
241 chansess->x11listener = NULL; 241 chansess->x11listener = NULL;
242 chansess->x11authprot = NULL; 242 chansess->x11authprot = NULL;
243 chansess->x11authcookie = NULL; 243 chansess->x11authcookie = NULL;
244 #endif 244 #endif
245 245
246 #ifdef ENABLE_AGENTFWD 246 #ifdef ENABLE_SVR_AGENTFWD
247 chansess->agentlistener = NULL; 247 chansess->agentlistener = NULL;
248 chansess->agentfile = NULL; 248 chansess->agentfile = NULL;
249 chansess->agentdir = NULL; 249 chansess->agentdir = NULL;
250 #endif 250 #endif
251 251
298 298
299 #ifndef DISABLE_X11FWD 299 #ifndef DISABLE_X11FWD
300 x11cleanup(chansess); 300 x11cleanup(chansess);
301 #endif 301 #endif
302 302
303 #ifdef ENABLE_AGENTFWD 303 #ifdef ENABLE_SVR_AGENTFWD
304 svr_agentcleanup(chansess); 304 svr_agentcleanup(chansess);
305 #endif 305 #endif
306 306
307 /* clear child pid entries */ 307 /* clear child pid entries */
308 for (i = 0; i < svr_ses.childpidsize; i++) { 308 for (i = 0; i < svr_ses.childpidsize; i++) {
356 ret = sessioncommand(channel, chansess, 1, 1); 356 ret = sessioncommand(channel, chansess, 1, 1);
357 #ifndef DISABLE_X11FWD 357 #ifndef DISABLE_X11FWD
358 } else if (strcmp(type, "x11-req") == 0) { 358 } else if (strcmp(type, "x11-req") == 0) {
359 ret = x11req(chansess); 359 ret = x11req(chansess);
360 #endif 360 #endif
361 #ifdef ENABLE_AGENTFWD 361 #ifdef ENABLE_SVR_AGENTFWD
362 } else if (strcmp(type, "[email protected]") == 0) { 362 } else if (strcmp(type, "[email protected]") == 0) {
363 ret = svr_agentreq(chansess); 363 ret = svr_agentreq(chansess);
364 #endif 364 #endif
365 } else if (strcmp(type, "signal") == 0) { 365 } else if (strcmp(type, "signal") == 0) {
366 ret = sessionsignal(chansess); 366 ret = sessionsignal(chansess);
943 943
944 #ifndef DISABLE_X11FWD 944 #ifndef DISABLE_X11FWD
945 /* set up X11 forwarding if enabled */ 945 /* set up X11 forwarding if enabled */
946 x11setauth(chansess); 946 x11setauth(chansess);
947 #endif 947 #endif
948 #ifdef ENABLE_AGENTFWD 948 #ifdef ENABLE_SVR_AGENTFWD
949 /* set up agent env variable */ 949 /* set up agent env variable */
950 svr_agentset(chansess); 950 svr_agentset(chansess);
951 #endif 951 #endif
952 952
953 usershell = m_strdup(get_user_shell()); 953 usershell = m_strdup(get_user_shell());