[BACK]Return to log-server.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/Attic/log-server.c between version 1.14 and 1.14.2.3

version 1.14, 2000/04/14 10:30:31 version 1.14.2.3, 2001/03/12 15:44:11
Line 1 
Line 1 
 /*  /*
  *  
  * log-server.c  
  *  
  * Author: Tatu Ylonen <ylo@cs.hut.fi>   * Author: Tatu Ylonen <ylo@cs.hut.fi>
  *  
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved   *                    All rights reserved
  *  
  * Created: Mon Mar 20 21:19:30 1995 ylo  
  *  
  * Server-side versions of debug(), log(), etc.  These normally send the output   * Server-side versions of debug(), log(), etc.  These normally send the output
  * to the system log.   * 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"  #include "includes.h"
 RCSID("$Id$");  RCSID("$OpenBSD$");
   
 #include <syslog.h>  #include <syslog.h>
 #include "packet.h"  #include "packet.h"
 #include "xmalloc.h"  #include "xmalloc.h"
 #include "ssh.h"  #include "log.h"
   
 static LogLevel log_level = SYSLOG_LEVEL_INFO;  static LogLevel log_level = SYSLOG_LEVEL_INFO;
 static int log_on_stderr = 0;  static int log_on_stderr = 0;
Line 37 
Line 58 
 {  {
         switch (level) {          switch (level) {
         case SYSLOG_LEVEL_QUIET:          case SYSLOG_LEVEL_QUIET:
         case SYSLOG_LEVEL_ERROR:  
         case SYSLOG_LEVEL_FATAL:          case SYSLOG_LEVEL_FATAL:
           case SYSLOG_LEVEL_ERROR:
         case SYSLOG_LEVEL_INFO:          case SYSLOG_LEVEL_INFO:
         case SYSLOG_LEVEL_VERBOSE:          case SYSLOG_LEVEL_VERBOSE:
         case SYSLOG_LEVEL_DEBUG:          case SYSLOG_LEVEL_DEBUG1:
           case SYSLOG_LEVEL_DEBUG2:
           case SYSLOG_LEVEL_DEBUG3:
                 log_level = level;                  log_level = level;
                 break;                  break;
         default:          default:
Line 105 
Line 128 
         if (level > log_level)          if (level > log_level)
                 return;                  return;
         switch (level) {          switch (level) {
           case SYSLOG_LEVEL_FATAL:
                   txt = "fatal";
                   pri = LOG_CRIT;
                   break;
         case SYSLOG_LEVEL_ERROR:          case SYSLOG_LEVEL_ERROR:
                 txt = "error";                  txt = "error";
                 pri = LOG_ERR;                  pri = LOG_ERR;
                 break;                  break;
         case SYSLOG_LEVEL_FATAL:  
                 txt = "fatal";  
                 pri = LOG_ERR;  
                 break;  
         case SYSLOG_LEVEL_INFO:          case SYSLOG_LEVEL_INFO:
                   pri = LOG_INFO;
                   break;
         case SYSLOG_LEVEL_VERBOSE:          case SYSLOG_LEVEL_VERBOSE:
                 pri = LOG_INFO;                  pri = LOG_INFO;
                 break;                  break;
         case SYSLOG_LEVEL_DEBUG:          case SYSLOG_LEVEL_DEBUG1:
                 txt = "debug";                  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;                  pri = LOG_DEBUG;
                 break;                  break;
         default:          default:
Legend:
Removed from v.1.14  
changed lines
  Added in v.1.14.2.3