commit 0aa8e5395ca08c7fa927bccd8a763edc4ae61f7b
author Damien Miller <djm@mindrot.org> Tue Nov 02 19:05:02 1999 +1100
committer Damien Miller <djm@mindrot.org> Tue Nov 02 19:05:02 1999 +1100
tree 16240837c2613ad11b3ef0856e7b19850c14e477
parent e2db1e1cc538f312392a8eff6ad883e563364e70

Merged one line cleanup from OBSD CVS

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index bc0115e..86b891b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+19991102
+ - Merged change from OpenBSD CVS
+  - One-line cleanup in sshd.c
+
 19991030
  - Integrated debian package support from Dan Brosemer <odin@linuxfreak.com>
  - Merged latest updates for OpenBSD CVS:

sshd.c

diff --git a/sshd.c b/sshd.c
index a4af9e2..49456cd 100644
--- a/sshd.c
+++ b/sshd.c
@@ -18,7 +18,7 @@
 */
 
 #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 "rsa.h"
@@ -1493,7 +1493,7 @@
   if (pw->pw_uid == 0 && !options.permit_root_login)
     {
       if (forced_command)
-	log("Root login accepted for forced command.", forced_command);
+	log("Root login accepted for forced command.");
       else
 	packet_disconnect("ROOT LOGIN REFUSED FROM %.200s", 
 			  get_canonical_hostname());