diff options
| -rw-r--r-- | sbin/dhclient/dhclient.c | 3 | ||||
| -rw-r--r-- | sbin/dhclient/dhcpd.h | 3 | ||||
| -rw-r--r-- | sbin/dhclient/errwarn.c | 16 | ||||
| -rw-r--r-- | sbin/dhclient/options.c | 3 | ||||
| -rw-r--r-- | sbin/dhclient/tables.c | 3 | ||||
| -rw-r--r-- | sbin/dhclient/tree.c | 4 | ||||
| -rw-r--r-- | sbin/dhclient/tree.h | 3 |
7 files changed, 14 insertions, 21 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 6af9e243b7e..655ed0ca470 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.72 2005/07/08 00:57:36 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.73 2005/07/09 14:36:15 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -82,7 +82,6 @@ struct sockaddr_in sockaddr_broadcast; #define TIME_MAX 2147483647 -int log_priority; int no_daemon; int unknown_ok = 1; int routefd; diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index 9fdf6390f06..208193424f8 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.38 2005/07/09 01:06:00 krw Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.39 2005/07/09 14:36:15 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -341,7 +341,6 @@ char *piaddr(struct iaddr); extern char *path_dhclient_conf; extern char *path_dhclient_db; extern time_t cur_time; -extern int log_priority; extern int log_perror; extern struct client_config top_level_config; diff --git a/sbin/dhclient/errwarn.c b/sbin/dhclient/errwarn.c index 1be0067d97a..6c0fbefc380 100644 --- a/sbin/dhclient/errwarn.c +++ b/sbin/dhclient/errwarn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: errwarn.c,v 1.11 2005/06/01 02:05:55 cloder Exp $ */ +/* $OpenBSD: errwarn.c,v 1.12 2005/07/09 14:36:15 krw Exp $ */ /* Errors and warnings... */ @@ -69,7 +69,7 @@ error(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? */ @@ -101,7 +101,7 @@ warning(char *fmt, ...) va_end(list); #ifndef DEBUG - syslog(log_priority | LOG_ERR, "%s", mbuf); + syslog(LOG_ERR, "%s", mbuf); #endif if (log_perror) { @@ -127,7 +127,7 @@ note(char *fmt, ...) va_end(list); #ifndef DEBUG - syslog(log_priority | LOG_INFO, "%s", mbuf); + syslog(LOG_INFO, "%s", mbuf); #endif if (log_perror) { @@ -153,7 +153,7 @@ debug(char *fmt, ...) va_end(list); #ifndef DEBUG - syslog(log_priority | LOG_DEBUG, "%s", mbuf); + syslog(LOG_DEBUG, "%s", mbuf); #endif if (log_perror) { @@ -218,10 +218,10 @@ parse_warn(char *fmt, ...) va_end(list); #ifndef DEBUG - syslog(log_priority | LOG_ERR, "%s", mbuf); - syslog(log_priority | LOG_ERR, "%s", token_line); + syslog(LOG_ERR, "%s", mbuf); + syslog(LOG_ERR, "%s", token_line); if (lexline < 81) - syslog(log_priority | LOG_ERR, + syslog(LOG_ERR, "%s^", &spaces[sizeof(spaces) - lexchar]); #endif diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c index 473e5eb080d..a424795b455 100644 --- a/sbin/dhclient/options.c +++ b/sbin/dhclient/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.19 2005/07/08 14:15:23 krw Exp $ */ +/* $OpenBSD: options.c,v 1.20 2005/07/09 14:36:16 krw Exp $ */ /* DHCP options parsing and reassembly. */ @@ -42,7 +42,6 @@ #include <ctype.h> -#define DHCP_OPTION_DATA #include "dhcpd.h" int bad_options = 0; diff --git a/sbin/dhclient/tables.c b/sbin/dhclient/tables.c index 66a46f94e1f..e064a8395a8 100644 --- a/sbin/dhclient/tables.c +++ b/sbin/dhclient/tables.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tables.c,v 1.6 2005/07/09 01:06:00 krw Exp $ */ +/* $OpenBSD: tables.c,v 1.7 2005/07/09 14:36:16 krw Exp $ */ /* Tables of information... */ @@ -412,7 +412,6 @@ initialize_dhcp_universe(void) { int i; - dhcp_universe.name = "dhcp"; dhcp_universe.hash = new_hash(); if (!dhcp_universe.hash) error("Can't allocate dhcp option hash table."); diff --git a/sbin/dhclient/tree.c b/sbin/dhclient/tree.c index 89ac450ac5b..0905f33c5d4 100644 --- a/sbin/dhclient/tree.c +++ b/sbin/dhclient/tree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tree.c,v 1.13 2004/05/06 22:29:15 deraadt Exp $ */ +/* $OpenBSD: tree.c,v 1.14 2005/07/09 14:36:16 krw Exp $ */ /* Routines for manipulating parse trees... */ @@ -42,8 +42,6 @@ #include "dhcpd.h" -extern int h_errno; - pair cons(caddr_t car, pair cdr) { diff --git a/sbin/dhclient/tree.h b/sbin/dhclient/tree.h index 24cf676764c..c7d257b5b66 100644 --- a/sbin/dhclient/tree.h +++ b/sbin/dhclient/tree.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tree.h,v 1.8 2005/07/09 01:06:00 krw Exp $ */ +/* $OpenBSD: tree.h,v 1.9 2005/07/09 14:36:16 krw Exp $ */ /* Definitions for address trees... */ @@ -46,7 +46,6 @@ typedef struct _pair { } *pair; struct universe { - char *name; struct hash_table *hash; struct option *options[256]; }; |