View | Details | Raw Unified | Return to bug 453
Collapse All | Expand All

(-)./session.c.orig2 (-2 / +10 lines)
Lines 1325-1335 Link Here
1325
	 * legal, and means /bin/sh.
1325
	 * legal, and means /bin/sh.
1326
	 */
1326
	 */
1327
	shell = (pw->pw_shell[0] == '\0') ? _PATH_BSHELL : pw->pw_shell;
1327
	shell = (pw->pw_shell[0] == '\0') ? _PATH_BSHELL : pw->pw_shell;
1328
1329
	/* Set up the environment for child */
1330
	env = do_setup_env(s, shell);
1331
1332
	/*
1333
	 * The shell specifed in login class overrides the shell in passwd,
1334
	 * but, according to the login.conf(5), the SHELL env variable must
1335
	 * contain the value from passwd, so we do this *after* setting up
1336
	 * child's environment.
1337
	 */
1328
#ifdef HAVE_LOGIN_CAP
1338
#ifdef HAVE_LOGIN_CAP
1329
	shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell);
1339
	shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell);
1330
#endif
1340
#endif
1331
1332
	env = do_setup_env(s, shell);
1333
1341
1334
	/* we have to stash the hostname before we close our socket. */
1342
	/* we have to stash the hostname before we close our socket. */
1335
	if (options.use_login)
1343
	if (options.use_login)

Return to bug 453