- markus@cvs.openbsd.org 2001/05/03 15:45:15
[session.c] exec shell -c /bin/sh .ssh/sshrc, from abartlet@pcug.org.au
This commit is contained in:
parent
2b45180b2e
commit
60402fd42a
|
@ -3,6 +3,9 @@
|
||||||
- stevesk@cvs.openbsd.org 2001/05/03 15:07:39
|
- stevesk@cvs.openbsd.org 2001/05/03 15:07:39
|
||||||
[channels.c]
|
[channels.c]
|
||||||
typo in debug() string
|
typo in debug() string
|
||||||
|
- markus@cvs.openbsd.org 2001/05/03 15:45:15
|
||||||
|
[session.c]
|
||||||
|
exec shell -c /bin/sh .ssh/sshrc, from abartlet@pcug.org.au
|
||||||
|
|
||||||
20010503
|
20010503
|
||||||
- OpenBSD CVS Sync
|
- OpenBSD CVS Sync
|
||||||
|
@ -5314,4 +5317,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.1191 2001/05/03 22:35:32 mouring Exp $
|
$Id: ChangeLog,v 1.1192 2001/05/03 22:37:26 mouring Exp $
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: session.c,v 1.74 2001/04/17 19:34:25 markus Exp $");
|
RCSID("$OpenBSD: session.c,v 1.75 2001/05/03 15:45:15 markus Exp $");
|
||||||
|
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "ssh1.h"
|
#include "ssh1.h"
|
||||||
|
@ -1393,10 +1393,11 @@ do_child(Session *s, const char *command)
|
||||||
if (!options.use_login) {
|
if (!options.use_login) {
|
||||||
/* ignore _PATH_SSH_USER_RC for subsystems */
|
/* ignore _PATH_SSH_USER_RC for subsystems */
|
||||||
if (!s->is_subsystem && (stat(_PATH_SSH_USER_RC, &st) >= 0)) {
|
if (!s->is_subsystem && (stat(_PATH_SSH_USER_RC, &st) >= 0)) {
|
||||||
|
snprintf(cmd, sizeof cmd, "%s -c '%s %s'",
|
||||||
|
shell, _PATH_BSHELL, _PATH_SSH_USER_RC);
|
||||||
if (debug_flag)
|
if (debug_flag)
|
||||||
fprintf(stderr, "Running %s %s\n", _PATH_BSHELL,
|
fprintf(stderr, "Running %s\n", cmd);
|
||||||
_PATH_SSH_USER_RC);
|
f = popen(cmd, "w");
|
||||||
f = popen(_PATH_BSHELL " " _PATH_SSH_USER_RC, "w");
|
|
||||||
if (f) {
|
if (f) {
|
||||||
if (do_xauth)
|
if (do_xauth)
|
||||||
fprintf(f, "%s %s\n", s->auth_proto,
|
fprintf(f, "%s %s\n", s->auth_proto,
|
||||||
|
|
Loading…
Reference in New Issue