4 files changed, 21 insertions, 284 deletions

diff --git a/ChangeLog b/ChangeLog
index de41b8468..5909f3be6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -169,6 +169,7 @@
      [sshd.8]
      list SSH2 ciphers
  - (bal) Put HAVE_PW_CLASS_IN_PASSWD back into pwcopy()
+ - (bal) Fix up logging since it changed.  removed log-*.c
 
 20010304
  - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4361,4 +4362,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.904 2001/03/05 07:57:09 mouring Exp $
+$Id: ChangeLog,v 1.905 2001/03/05 08:16:54 mouring Exp $
diff --git a/Makefile.in b/Makefile.in
index 2215d78af..0f7bc5db0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.155 2001/02/18 19:13:33 mouring Exp $
+# $Id: Makefile.in,v 1.156 2001/03/05 08:16:54 mouring Exp $
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -46,9 +46,9 @@ TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keys
 
 LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o cli.o compat.o compress.o crc32.o deattack.o dispatch.o mac.o hostfile.o key.o kex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o 
 
-SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o
+SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o readconf.o clientloop.o
 
-SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-chall.o auth2-chall.o auth-rhosts.o auth-options.o auth-krb4.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o auth-sia.o dh.o sshpty.o log-server.o sshlogin.o loginrec.o servconf.o serverloop.o md5crypt.o session.o groupaccess.o
+SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-chall.o auth2-chall.o auth-rhosts.o auth-options.o auth-krb4.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o auth-sia.o dh.o sshpty.o sshlogin.o loginrec.o servconf.o serverloop.o md5crypt.o session.o groupaccess.o
 
 TROFFMAN        = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1
 CATMAN          = scp.0 ssh-add.0 ssh-agent.0 ssh-keygen.0 ssh-keyscan.0 ssh.0 sshd.0 sftp-server.0 sftp.0
@@ -97,30 +97,30 @@ ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
 sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
         $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
-scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o log-client.o
-        $(LD) -o $@ scp.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o log.o
+        $(LD) -o $@ scp.o log.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
-ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o log-client.o
-        $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
+ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o log.o
+        $(LD) -o $@ ssh-add.o log.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 
-ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o log-client.o
-        $(LD) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
+ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o log.o
+        $(LD) -o $@ ssh-agent.o log.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 
-ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o log-client.o
-        $(LD) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
+ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o log.o
+        $(LD) -o $@ ssh-keygen.o log.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 
-ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a log-client.o ssh-keyscan.o
-        $(LD) -o $@ ssh-keyscan.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
+ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a log.o ssh-keyscan.o
+        $(LD) -o $@ ssh-keyscan.o log.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 
-sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp-server.o sftp-common.o log-server.o
-        $(LD) -o $@ sftp-server.o sftp-common.o log-server.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
+sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o log.o sftp-server.o
+        $(LD) -o $@ sftp-server.o sftp-common.o log.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 
-sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common.o log-client.o
-        $(LD) -o $@ sftp.o sftp-client.o sftp-common.o sftp-int.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common.o log.o
+        $(LD) -o $@ sftp.o sftp-client.o sftp-common.o sftp-int.o log.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
 # test driver for the loginrec code - not built by default
-logintest: logintest.o $(LIBCOMPAT) libssh.a log-client.o loginrec.o
-        $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh log-client.o $(LIBS)
+logintest: logintest.o $(LIBCOMPAT) libssh.a log.o loginrec.o
+        $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh log.o $(LIBS)
 
 $(MANPAGES) $(CONFIGFILES)::
         $(FIXPATHSCMD) $(srcdir)/$@
diff --git a/log-client.c b/log-client.c
deleted file mode 100644
index b35f77bc9..000000000
--- a/log-client.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Author: Tatu Ylonen <ylo@cs.hut.fi>
- * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
- *                    All rights reserved
- * Client-side versions of debug(), log(), etc.  These print to stderr.
- * This is a stripped down version of log-server.c.
- *
- * As far as I am concerned, the code I have written for this software
- * can be used freely for any purpose.  Any derived versions of this
- * software must be clearly marked as such, and if the derived work is
- * incompatible with the protocol description in the RFC file, it must be
- * called by a name other than "ssh" or "Secure Shell".
- *
- *
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "includes.h"
-RCSID("$OpenBSD: log-client.c,v 1.15 2001/01/21 19:05:50 markus Exp $");
-
-#include "xmalloc.h"
-#include "log.h"
-
-static LogLevel log_level = SYSLOG_LEVEL_INFO;
-
-/* Initialize the log.
- *   av0        program name (should be argv[0])
- *   level      logging level
- */
-
-void
-log_init(char *av0, LogLevel level, SyslogFacility ignored1, int ignored2)
-{
-        switch (level) {
-        case SYSLOG_LEVEL_QUIET:
-        case SYSLOG_LEVEL_FATAL:
-        case SYSLOG_LEVEL_ERROR:
-        case SYSLOG_LEVEL_INFO:
-        case SYSLOG_LEVEL_VERBOSE:
-        case SYSLOG_LEVEL_DEBUG1:
-        case SYSLOG_LEVEL_DEBUG2:
-        case SYSLOG_LEVEL_DEBUG3:
-                log_level = level;
-                break;
-        default:
-                /* unchanged */
-                break;
-        }
-}
-
-#define MSGBUFSIZ 1024
-
-void
-do_log(LogLevel level, const char *fmt, va_list args)
-{
-        char msgbuf[MSGBUFSIZ];
-
-        if (level > log_level)
-                return;
-        if (level >= SYSLOG_LEVEL_DEBUG1)
-                fprintf(stderr, "debug: ");
-        vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
-        fprintf(stderr, "%s\r\n", msgbuf);
-}
diff --git a/log-server.c b/log-server.c
deleted file mode 100644
index 3c53d9c59..000000000
--- a/log-server.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Author: Tatu Ylonen <ylo@cs.hut.fi>
- * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
- *                    All rights reserved
- * Server-side versions of debug(), log(), etc.  These normally send the output
- * to the system log.
- *
- * As far as I am concerned, the code I have written for this software
- * can be used freely for any purpose.  Any derived versions of this
- * software must be clearly marked as such, and if the derived work is
- * incompatible with the protocol description in the RFC file, it must be
- * called by a name other than "ssh" or "Secure Shell".
- *
- *
- * Copyright (c) 2000 Markus Friedl.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "includes.h"
-RCSID("$OpenBSD: log-server.c,v 1.20 2001/01/21 19:05:50 markus Exp $");
-
-#include <syslog.h>
-#include "packet.h"
-#include "xmalloc.h"
-#include "log.h"
-
-static LogLevel log_level = SYSLOG_LEVEL_INFO;
-static int log_on_stderr = 0;
-static int log_facility = LOG_AUTH;
-
-/* Initialize the log.
- *   av0        program name (should be argv[0])
- *   on_stderr  print also on stderr
- *   level      logging level
- */
-
-void
-log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
-{
-        switch (level) {
-        case SYSLOG_LEVEL_QUIET:
-        case SYSLOG_LEVEL_FATAL:
-        case SYSLOG_LEVEL_ERROR:
-        case SYSLOG_LEVEL_INFO:
-        case SYSLOG_LEVEL_VERBOSE:
-        case SYSLOG_LEVEL_DEBUG1:
-        case SYSLOG_LEVEL_DEBUG2:
-        case SYSLOG_LEVEL_DEBUG3:
-                log_level = level;
-                break;
-        default:
-                fprintf(stderr, "Unrecognized internal syslog level code %d\n",
-                        (int) level);
-                exit(1);
-        }
-        switch (facility) {
-        case SYSLOG_FACILITY_DAEMON:
-                log_facility = LOG_DAEMON;
-                break;
-        case SYSLOG_FACILITY_USER:
-                log_facility = LOG_USER;
-                break;
-        case SYSLOG_FACILITY_AUTH:
-                log_facility = LOG_AUTH;
-                break;
-#ifdef LOG_AUTHPRIV
-        case SYSLOG_FACILITY_AUTHPRIV:
-                log_facility = LOG_AUTHPRIV;
-                break;
-#endif
-        case SYSLOG_FACILITY_LOCAL0:
-                log_facility = LOG_LOCAL0;
-                break;
-        case SYSLOG_FACILITY_LOCAL1:
-                log_facility = LOG_LOCAL1;
-                break;
-        case SYSLOG_FACILITY_LOCAL2:
-                log_facility = LOG_LOCAL2;
-                break;
-        case SYSLOG_FACILITY_LOCAL3:
-                log_facility = LOG_LOCAL3;
-                break;
-        case SYSLOG_FACILITY_LOCAL4:
-                log_facility = LOG_LOCAL4;
-                break;
-        case SYSLOG_FACILITY_LOCAL5:
-                log_facility = LOG_LOCAL5;
-                break;
-        case SYSLOG_FACILITY_LOCAL6:
-                log_facility = LOG_LOCAL6;
-                break;
-        case SYSLOG_FACILITY_LOCAL7:
-                log_facility = LOG_LOCAL7;
-                break;
-        default:
-                fprintf(stderr, "Unrecognized internal syslog facility code %d\n",
-                        (int) facility);
-                exit(1);
-        }
-        log_on_stderr = on_stderr;
-}
-
-#define MSGBUFSIZ 1024
-
-void
-do_log(LogLevel level, const char *fmt, va_list args)
-{
-        char msgbuf[MSGBUFSIZ];
-        char fmtbuf[MSGBUFSIZ];
-        char *txt = NULL;
-        int pri = LOG_INFO;
-        extern char *__progname;
-
-        if (level > log_level)
-                return;
-        switch (level) {
-        case SYSLOG_LEVEL_FATAL:
-                txt = "fatal";
-                pri = LOG_CRIT;
-                break;
-        case SYSLOG_LEVEL_ERROR:
-                txt = "error";
-                pri = LOG_ERR;
-                break;
-        case SYSLOG_LEVEL_INFO:
-                pri = LOG_INFO;
-                break;
-        case SYSLOG_LEVEL_VERBOSE:
-                pri = LOG_INFO;
-                break;
-        case SYSLOG_LEVEL_DEBUG1:
-                txt = "debug1";
-                pri = LOG_DEBUG;
-                break;
-        case SYSLOG_LEVEL_DEBUG2:
-                txt = "debug2";
-                pri = LOG_DEBUG;
-                break;
-        case SYSLOG_LEVEL_DEBUG3:
-                txt = "debug3";
-                pri = LOG_DEBUG;
-                break;
-        default:
-                txt = "internal error";
-                pri = LOG_ERR;
-                break;
-        }
-        if (txt != NULL) {
-                snprintf(fmtbuf, sizeof(fmtbuf), "%s: %s", txt, fmt);
-                vsnprintf(msgbuf, sizeof(msgbuf), fmtbuf, args);
-        } else {
-                vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
-        }
-        if (log_on_stderr) {
-                fprintf(stderr, "%s\n", msgbuf);
-        } else {
-                openlog(__progname, LOG_PID, log_facility);
-                syslog(pri, "%.500s", msgbuf);
-                closelog();
-        }
-}