diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | session.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -33,6 +33,9 @@ | |||
33 | - jmc@cvs.openbsd.org 2008/04/18 17:15:47 | 33 | - jmc@cvs.openbsd.org 2008/04/18 17:15:47 |
34 | [sftp.1] | 34 | [sftp.1] |
35 | macro fixage; | 35 | macro fixage; |
36 | - djm@cvs.openbsd.org 2008/04/18 22:01:33 | ||
37 | [session.c] | ||
38 | remove unneccessary parentheses | ||
36 | 39 | ||
37 | 20080403 | 40 | 20080403 |
38 | - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile- | 41 | - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile- |
@@ -3893,4 +3896,4 @@ | |||
3893 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3896 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3894 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3897 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3895 | 3898 | ||
3896 | $Id: ChangeLog,v 1.4912 2008/05/19 04:54:25 djm Exp $ | 3899 | $Id: ChangeLog,v 1.4913 2008/05/19 04:55:02 djm Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: session.c,v 1.233 2008/03/26 21:28:14 djm Exp $ */ | 1 | /* $OpenBSD: session.c,v 1.234 2008/04/18 22:01:33 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -1204,7 +1204,7 @@ do_rc_files(Session *s, const char *shell) | |||
1204 | 1204 | ||
1205 | /* ignore _PATH_SSH_USER_RC for subsystems and admin forced commands */ | 1205 | /* ignore _PATH_SSH_USER_RC for subsystems and admin forced commands */ |
1206 | if (!s->is_subsystem && options.adm_forced_command == NULL && | 1206 | if (!s->is_subsystem && options.adm_forced_command == NULL && |
1207 | !no_user_rc && (stat(_PATH_SSH_USER_RC, &st) >= 0)) { | 1207 | !no_user_rc && stat(_PATH_SSH_USER_RC, &st) >= 0) { |
1208 | snprintf(cmd, sizeof cmd, "%s -c '%s %s'", | 1208 | snprintf(cmd, sizeof cmd, "%s -c '%s %s'", |
1209 | shell, _PATH_BSHELL, _PATH_SSH_USER_RC); | 1209 | shell, _PATH_BSHELL, _PATH_SSH_USER_RC); |
1210 | if (debug_flag) | 1210 | if (debug_flag) |