Merged one line cleanup from OBSD CVS

diff --git a/ChangeLog b/ChangeLog
index bc0115e9a01b74f250df5c75297ff870bbf1acc7..86b891be179678b42333f2027b99bd299fd51b23 100644 (file)
--- 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:

diff --git a/sshd.c b/sshd.c
index a4af9e2a3230d65434a543ec81b88ba172ec817a..49456cdb56205fa5fc80112d921ba6746ea998e7 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -18,7 +18,7 @@ agent connections.
 */
 
 #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 @@ do_authentication(char *user, int privileged_port)
   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());