summaryrefslogtreecommitdiff
path: root/omapip
diff options
context:
space:
mode:
authorShawn Routhier <sar@isc.org>2014-04-25 10:50:24 -0700
committerShawn Routhier <sar@isc.org>2014-04-25 10:50:24 -0700
commit38c4774a4324a16f0a9f39950700699949acb362 (patch)
treebb2da2f818d6eb7d362daaca512990bf3aa1a202 /omapip
parent57187138e0098a281b689de6170325d4c9fe4c0b (diff)
downloadisc-dhcp-38c4774a4324a16f0a9f39950700699949acb362.tar.gz
[master] Several small patches
Tidy up several small tickets Correct parsing of DUID from config file, previously the LL type was put in the wrong place in the DUID string. [ISC-Bugs #20962] Add code to parse "do-forward-updates" as well as "do-forward-update" [ISC-Bugs #31328] Remove log_priority as it isn't currently used. [ISC-Bugs #33397] Increase the size of the buffer used for reading interface information. [ISC-Bugs #34858]
Diffstat (limited to 'omapip')
-rw-r--r--omapip/errwarn.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/omapip/errwarn.c b/omapip/errwarn.c
index 4b3d353d..7c91d9d3 100644
--- a/omapip/errwarn.c
+++ b/omapip/errwarn.c
@@ -43,7 +43,6 @@ int log_perror = -1;
#else
int log_perror = 1;
#endif
-int log_priority;
void (*log_cleanup) (void);
#define CVT_BUF_MAX 1023
@@ -66,7 +65,7 @@ void log_fatal (const char * fmt, ... )
va_end (list);
#ifndef DEBUG
- syslog (log_priority | LOG_ERR, "%s", mbuf);
+ syslog (LOG_ERR, "%s", mbuf);
#endif
/* Also log it to stderr? */
@@ -105,7 +104,7 @@ int log_error (const char * fmt, ...)
va_end (list);
#ifndef DEBUG
- syslog (log_priority | LOG_ERR, "%s", mbuf);
+ syslog (LOG_ERR, "%s", mbuf);
#endif
if (log_perror) {
@@ -132,7 +131,7 @@ int log_info (const char *fmt, ...)
va_end (list);
#ifndef DEBUG
- syslog (log_priority | LOG_INFO, "%s", mbuf);
+ syslog (LOG_INFO, "%s", mbuf);
#endif
if (log_perror) {
@@ -159,7 +158,7 @@ int log_debug (const char *fmt, ...)
va_end (list);
#ifndef DEBUG
- syslog (log_priority | LOG_DEBUG, "%s", mbuf);
+ syslog (LOG_DEBUG, "%s", mbuf);
#endif
if (log_perror) {