diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-07-17 16:12:08 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-07-17 16:12:08 +1000 |
commit | fc9597034b819b295966f61d8dc797b53fda45c7 (patch) | |
tree | a5a9b7afc50720d7b6f89a4ae1f211abbff89f47 /session.c | |
parent | ba6de952a00558e6d93b8c9edd81806a99716411 (diff) |
- deraadt@cvs.openbsd.org 2004/07/11 17:48:47
[channels.c cipher.c clientloop.c clientloop.h compat.h moduli.c
readconf.c nchan.c pathnames.h progressmeter.c readconf.h servconf.c
session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h
sshd.c ttymodes.h]
spaces
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.177 2004/06/30 08:36:59 djm Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.178 2004/07/11 17:48:47 deraadt Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -1001,7 +1001,7 @@ do_setup_env(Session *s, const char *shell) | |||
1001 | if (!options.use_login) { | 1001 | if (!options.use_login) { |
1002 | /* Set basic environment. */ | 1002 | /* Set basic environment. */ |
1003 | for (i = 0; i < s->num_env; i++) | 1003 | for (i = 0; i < s->num_env; i++) |
1004 | child_set_env(&env, &envsize, s->env[i].name, | 1004 | child_set_env(&env, &envsize, s->env[i].name, |
1005 | s->env[i].val); | 1005 | s->env[i].val); |
1006 | 1006 | ||
1007 | child_set_env(&env, &envsize, "USER", pw->pw_name); | 1007 | child_set_env(&env, &envsize, "USER", pw->pw_name); |
@@ -1320,7 +1320,7 @@ do_pwchange(Session *s) | |||
1320 | { | 1320 | { |
1321 | fprintf(stderr, "WARNING: Your password has expired.\n"); | 1321 | fprintf(stderr, "WARNING: Your password has expired.\n"); |
1322 | if (s->ttyfd != -1) { | 1322 | if (s->ttyfd != -1) { |
1323 | fprintf(stderr, | 1323 | fprintf(stderr, |
1324 | "You must change your password now and login again!\n"); | 1324 | "You must change your password now and login again!\n"); |
1325 | execl(_PATH_PASSWD_PROG, "passwd", (char *)NULL); | 1325 | execl(_PATH_PASSWD_PROG, "passwd", (char *)NULL); |
1326 | perror("passwd"); | 1326 | perror("passwd"); |