diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | session.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -10,6 +10,9 @@ | |||
10 | [channels.c sshconnect.c sshd.c] | 10 | [channels.c sshconnect.c sshd.c] |
11 | remove use of SO_LINGER, it should not be needed. error check | 11 | remove use of SO_LINGER, it should not be needed. error check |
12 | SO_REUSEADDR. fixup comments. ok markus@ | 12 | SO_REUSEADDR. fixup comments. ok markus@ |
13 | - stevesk@cvs.openbsd.org 2002/09/16 19:55:33 | ||
14 | [session.c] | ||
15 | log when _PATH_NOLOGIN exists; ok markus@ | ||
13 | 16 | ||
14 | 20020912 | 17 | 20020912 |
15 | - (djm) Made GNOME askpass programs return non-zero if cancel button is | 18 | - (djm) Made GNOME askpass programs return non-zero if cancel button is |
@@ -660,4 +663,4 @@ | |||
660 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 663 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
661 | ok provos@ | 664 | ok provos@ |
662 | 665 | ||
663 | $Id: ChangeLog,v 1.2466 2002/09/19 01:49:37 djm Exp $ | 666 | $Id: ChangeLog,v 1.2467 2002/09/19 01:50:48 djm Exp $ |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.149 2002/09/12 19:50:36 stevesk Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.150 2002/09/16 19:55:33 stevesk Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -1168,6 +1168,8 @@ do_nologin(struct passwd *pw) | |||
1168 | #endif | 1168 | #endif |
1169 | if (f) { | 1169 | if (f) { |
1170 | /* /etc/nologin exists. Print its contents and exit. */ | 1170 | /* /etc/nologin exists. Print its contents and exit. */ |
1171 | log("User %.100s not allowed because %s exists", | ||
1172 | pw->pw_name, _PATH_NOLOGIN); | ||
1171 | while (fgets(buf, sizeof(buf), f)) | 1173 | while (fgets(buf, sizeof(buf), f)) |
1172 | fputs(buf, stderr); | 1174 | fputs(buf, stderr); |
1173 | fclose(f); | 1175 | fclose(f); |