diff options
| author | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
| commit | c62812877398840dae0ba74b03e9e6a43cc56fc5 (patch) | |
| tree | 304551aa93f09787d4f56a966c6409faf1b1bcb0 /contrib/ntp/libntp/msyslog.c | |
| parent | 9e809ce638c9be9ffb800ced1b91c0e8997f4c9e (diff) | |
| download | FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.zip FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.tar.gz | |
Upgrade NTP to 4.2.8p4.
Security: FreeBSD-SA-15:25.ntp
Security: CVE-2015-7871
Security: CVE-2015-7855
Security: CVE-2015-7854
Security: CVE-2015-7853
Security: CVE-2015-7852
Security: CVE-2015-7851
Security: CVE-2015-7850
Security: CVE-2015-7849
Security: CVE-2015-7848
Security: CVE-2015-7701
Security: CVE-2015-7703
Security: CVE-2015-7704, CVE-2015-7705
Security: CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
Diffstat (limited to 'contrib/ntp/libntp/msyslog.c')
| -rw-r--r-- | contrib/ntp/libntp/msyslog.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/contrib/ntp/libntp/msyslog.c b/contrib/ntp/libntp/msyslog.c index 283414d..cc8868f 100644 --- a/contrib/ntp/libntp/msyslog.c +++ b/contrib/ntp/libntp/msyslog.c @@ -38,7 +38,7 @@ char * syslog_abs_fname; #define INIT_NTP_SYSLOGMASK ~(u_int32)0 u_int32 ntp_syslogmask = INIT_NTP_SYSLOGMASK; -extern char * progname; +extern char const * progname; /* Declare the local functions */ void addto_syslog (int, const char *); @@ -145,8 +145,8 @@ addto_syslog( const char * msg ) { - static char * prevcall_progname; - static char * prog; + static char const * prevcall_progname; + static char const * prog; const char nl[] = "\n"; const char empty[] = ""; FILE * term_file; @@ -357,6 +357,18 @@ msyslog( addto_syslog(level, buf); } +void +mvsyslog( + int level, + const char * fmt, + va_list ap + ) +{ + char buf[1024]; + mvsnprintf(buf, sizeof(buf), fmt, ap); + addto_syslog(level, buf); +} + /* * Initialize the logging @@ -371,7 +383,7 @@ init_logging( ) { static int was_daemon; - const char * cp; + char * cp; const char * pname; /* @@ -402,7 +414,7 @@ init_logging( #ifdef SYS_WINNT /* strip ".exe" */ cp = strrchr(progname, '.'); if (NULL != cp && !strcasecmp(cp, ".exe")) - progname[cp - progname] = '\0'; + *cp = '\0'; #endif #if !defined(VMS) @@ -454,7 +466,7 @@ change_logfile( size_t octets; #endif /* POSIX */ - NTP_REQUIRE(fname != NULL); + REQUIRE(fname != NULL); log_fname = fname; /* |
