summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-11-02 19:05:02 +1100
committerDamien Miller <djm@mindrot.org>1999-11-02 19:05:02 +1100
commit0aa8e5395ca08c7fa927bccd8a763edc4ae61f7b (patch)
tree16240837c2613ad11b3ef0856e7b19850c14e477
parente2db1e1cc538f312392a8eff6ad883e563364e70 (diff)
Merged one line cleanup from OBSD CVS
-rw-r--r--ChangeLog4
-rw-r--r--sshd.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bc0115e9a..86b891be1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
119991102
2 - Merged change from OpenBSD CVS
3 - One-line cleanup in sshd.c
4
119991030 519991030
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:
diff --git a/sshd.c b/sshd.c
index a4af9e2a3..49456cdb5 100644
--- a/sshd.c
+++ b/sshd.c
@@ -18,7 +18,7 @@ agent connections.
18*/ 18*/
19 19
20#include "includes.h" 20#include "includes.h"
21RCSID("$Id: sshd.c,v 1.9 1999/10/29 03:09:40 damien Exp $"); 21RCSID("$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());