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

Diff for /src/usr.bin/ssh/log.c between version 1.7 and 1.7.2.2

version 1.7, 2000/01/04 00:07:59 version 1.7.2.2, 2001/03/12 15:44:11
Line 1 
Line 1 
 /*  /*
    * Author: Tatu Ylonen <ylo@cs.hut.fi>
    * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
    *                    All rights reserved
    *
    * 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".
    */
   /*
  * Shared versions of debug(), log(), etc.   * Shared versions of debug(), log(), etc.
    *
    * 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("$OpenBSD$");  RCSID("$OpenBSD$");
   
 #include "ssh.h"  #include "log.h"
 #include "xmalloc.h"  #include "xmalloc.h"
   
 /* Fatal messages.  This function never returns. */  /* Fatal messages.  This function never returns. */
Line 60 
Line 93 
 {  {
         va_list args;          va_list args;
         va_start(args, fmt);          va_start(args, fmt);
         do_log(SYSLOG_LEVEL_DEBUG, fmt, args);          do_log(SYSLOG_LEVEL_DEBUG1, fmt, args);
         va_end(args);          va_end(args);
 }  }
   
   void
   debug2(const char *fmt,...)
   {
           va_list args;
           va_start(args, fmt);
           do_log(SYSLOG_LEVEL_DEBUG2, fmt, args);
           va_end(args);
   }
   
   void
   debug3(const char *fmt,...)
   {
           va_list args;
           va_start(args, fmt);
           do_log(SYSLOG_LEVEL_DEBUG3, fmt, args);
           va_end(args);
   }
   
 /* Fatal cleanup */  /* Fatal cleanup */
   
 struct fatal_cleanup {  struct fatal_cleanup {
Line 104 
Line 155 
                 }                  }
         }          }
         fatal("fatal_remove_cleanup: no such cleanup function: 0x%lx 0x%lx\n",          fatal("fatal_remove_cleanup: no such cleanup function: 0x%lx 0x%lx\n",
               (unsigned long) proc, (unsigned long) context);                (u_long) proc, (u_long) context);
 }  }
   
 /* Cleanup and exit */  /* Cleanup and exit */
Line 121 
Line 172 
         for (cu = fatal_cleanups; cu; cu = next_cu) {          for (cu = fatal_cleanups; cu; cu = next_cu) {
                 next_cu = cu->next;                  next_cu = cu->next;
                 debug("Calling cleanup 0x%lx(0x%lx)",                  debug("Calling cleanup 0x%lx(0x%lx)",
                       (unsigned long) cu->proc, (unsigned long) cu->context);                        (u_long) cu->proc, (u_long) cu->context);
                 (*cu->proc) (cu->context);                  (*cu->proc) (cu->context);
         }          }
         exit(255);          exit(255);
Line 157 
Line 208 
         { "ERROR",      SYSLOG_LEVEL_ERROR },          { "ERROR",      SYSLOG_LEVEL_ERROR },
         { "INFO",       SYSLOG_LEVEL_INFO },          { "INFO",       SYSLOG_LEVEL_INFO },
         { "VERBOSE",    SYSLOG_LEVEL_VERBOSE },          { "VERBOSE",    SYSLOG_LEVEL_VERBOSE },
         { "DEBUG",      SYSLOG_LEVEL_DEBUG },          { "DEBUG",      SYSLOG_LEVEL_DEBUG1 },
           { "DEBUG1",     SYSLOG_LEVEL_DEBUG1 },
           { "DEBUG2",     SYSLOG_LEVEL_DEBUG2 },
           { "DEBUG3",     SYSLOG_LEVEL_DEBUG3 },
         { NULL, 0 }          { NULL, 0 }
 };  };
   
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.7.2.2