diff options
author | Damien Miller <djm@mindrot.org> | 1999-11-02 19:05:02 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-11-02 19:05:02 +1100 |
commit | 0aa8e5395ca08c7fa927bccd8a763edc4ae61f7b (patch) | |
tree | 16240837c2613ad11b3ef0856e7b19850c14e477 | |
parent | e2db1e1cc538f312392a8eff6ad883e563364e70 (diff) |
Merged one line cleanup from OBSD CVS
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | sshd.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ | |||
1 | 19991102 | ||
2 | - Merged change from OpenBSD CVS | ||
3 | - One-line cleanup in sshd.c | ||
4 | |||
1 | 19991030 | 5 | 19991030 |
2 | - Integrated debian package support from Dan Brosemer <odin@linuxfreak.com> | 6 | - Integrated debian package support from Dan Brosemer <odin@linuxfreak.com> |
3 | - Merged latest updates for OpenBSD CVS: | 7 | - Merged latest updates for OpenBSD CVS: |
@@ -18,7 +18,7 @@ agent connections. | |||
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include "includes.h" | 20 | #include "includes.h" |
21 | RCSID("$Id: sshd.c,v 1.9 1999/10/29 03:09:40 damien Exp $"); | 21 | RCSID("$Id: sshd.c,v 1.10 1999/11/02 08:05:02 damien Exp $"); |
22 | 22 | ||
23 | #include "xmalloc.h" | 23 | #include "xmalloc.h" |
24 | #include "rsa.h" | 24 | #include "rsa.h" |
@@ -1493,7 +1493,7 @@ do_authentication(char *user, int privileged_port) | |||
1493 | if (pw->pw_uid == 0 && !options.permit_root_login) | 1493 | if (pw->pw_uid == 0 && !options.permit_root_login) |
1494 | { | 1494 | { |
1495 | if (forced_command) | 1495 | if (forced_command) |
1496 | log("Root login accepted for forced command.", forced_command); | 1496 | log("Root login accepted for forced command."); |
1497 | else | 1497 | else |
1498 | packet_disconnect("ROOT LOGIN REFUSED FROM %.200s", | 1498 | packet_disconnect("ROOT LOGIN REFUSED FROM %.200s", |
1499 | get_canonical_hostname()); | 1499 | get_canonical_hostname()); |