- Big OpenBSD CVS update (mainly beginnings of SSH2 infrastructure)

   - [auth.c session.c sshd.c auth.h]
     split sshd.c -> auth.c session.c sshd.c plus cleanup and goto-removal
   - [bufaux.c bufaux.h]
     support ssh2 bignums
   - [channels.c channels.h clientloop.c sshd.c nchan.c nchan.h packet.c]
     [readconf.c ssh.c ssh.h serverloop.c]
     replace big switch() with function tables (prepare for ssh2)
   - [ssh2.h]
     ssh2 message type codes
   - [sshd.8]
     reorder Xr to avoid cutting
   - [serverloop.c]
     close(fdin) if fdin != fdout, shutdown otherwise, ok theo@
   - [channels.c]
     missing close
     allow bigger packets
   - [cipher.c cipher.h]
     support ssh2 ciphers
   - [compress.c]
     cleanup, less code
   - [dispatch.c dispatch.h]
     function tables for different message types
   - [log-server.c]
     do not log() if debuggin to stderr
     rename a cpp symbol, to avoid param.h collision
   - [mpaux.c]
     KNF
   - [nchan.c]
     sync w/ channels.c

1 files changed, 7 insertions, 5 deletions

diff --git a/log-server.c b/log-server.c
index 7f732ed3b..476e49f80 100644
--- a/log-server.c
+++ b/log-server.c
@@ -15,7 +15,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: log-server.c,v 1.7 2000/03/09 10:27:50 damien Exp $");
+RCSID("$Id: log-server.c,v 1.8 2000/04/01 01:09:24 damien Exp $");
 
 #include <syslog.h>
 #include "packet.h"
@@ -137,9 +137,11 @@ do_log(LogLevel level, const char *fmt, va_list args)
         } else {
                 vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
         }
-        if (log_on_stderr)
+        if (log_on_stderr) {
                 fprintf(stderr, "%s\n", msgbuf);
-        openlog(__progname, LOG_PID, log_facility);
-        syslog(pri, "%.500s", msgbuf);
-        closelog();
+        } else {
+                openlog(__progname, LOG_PID, log_facility);
+                syslog(pri, "%.500s", msgbuf);
+                closelog();
+        }
 }