Merged one line cleanup from OBSD CVS

This commit is contained in:
Damien Miller 1999-11-02 19:05:02 +11:00
Родитель e2db1e1cc5
Коммит 0aa8e5395c
2 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

@ -1,3 +1,7 @@
19991102
- Merged change from OpenBSD CVS
- One-line cleanup in sshd.c
19991030 19991030
- Integrated debian package support from Dan Brosemer <odin@linuxfreak.com> - Integrated debian package support from Dan Brosemer <odin@linuxfreak.com>
- Merged latest updates for OpenBSD CVS: - Merged latest updates for OpenBSD CVS:

4
sshd.c
Просмотреть файл

@ -18,7 +18,7 @@ agent connections.
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: sshd.c,v 1.9 1999/10/29 03:09:40 damien Exp $"); RCSID("$Id: sshd.c,v 1.10 1999/11/02 08:05:02 damien Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "rsa.h" #include "rsa.h"
@ -1493,7 +1493,7 @@ do_authentication(char *user, int privileged_port)
if (pw->pw_uid == 0 && !options.permit_root_login) if (pw->pw_uid == 0 && !options.permit_root_login)
{ {
if (forced_command) if (forced_command)
log("Root login accepted for forced command.", forced_command); log("Root login accepted for forced command.");
else else
packet_disconnect("ROOT LOGIN REFUSED FROM %.200s", packet_disconnect("ROOT LOGIN REFUSED FROM %.200s",
get_canonical_hostname()); get_canonical_hostname());