[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.27 and 1.28

version 1.27, 2003/05/18 23:22:01 version 1.28, 2003/05/24 09:02:22
Line 40 
Line 40 
 #include "xmalloc.h"  #include "xmalloc.h"
   
 #include <syslog.h>  #include <syslog.h>
   #include <vis.h>
   
 static LogLevel log_level = SYSLOG_LEVEL_INFO;  static LogLevel log_level = SYSLOG_LEVEL_INFO;
 static int log_on_stderr = 1;  static int log_on_stderr = 1;
Line 380 
Line 381 
         } else {          } else {
                 vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);                  vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
         }          }
           strnvis(fmtbuf, msgbuf, sizeof(fmtbuf), VIS_SAFE|VIS_OCTAL);
         if (log_on_stderr) {          if (log_on_stderr) {
                 snprintf(fmtbuf, sizeof fmtbuf, "%s\r\n", msgbuf);                  snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf);
                 write(STDERR_FILENO, fmtbuf, strlen(fmtbuf));                  write(STDERR_FILENO, msgbuf, strlen(msgbuf));
         } else {          } else {
                 openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata);                  openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata);
                 syslog_r(pri, &sdata, "%.500s", msgbuf);                  syslog_r(pri, &sdata, "%.500s", fmtbuf);
                 closelog_r(&sdata);                  closelog_r(&sdata);
         }          }
 }  }
Legend:
Removed from v.1.27  
changed lines
  Added in v.1.28