diff options
| author | Moritz Jodeit <moritz@cvs.openbsd.org> | 2005-04-13 21:02:45 +0000 |
|---|---|---|
| committer | Moritz Jodeit <moritz@cvs.openbsd.org> | 2005-04-13 21:02:45 +0000 |
| commit | 2e308506842304547bdbf09af2119d63c4742598 (patch) | |
| tree | b3136242190d612802ea44a19cd296771795c1e4 | |
| parent | 021be9d318ff1dd44f1e15735412eb2d763e70ee (diff) | |
add some missing arguments, where format strings
expect them and a minor comment fix. ok reyk@
| -rw-r--r-- | usr.sbin/hostapd/iapp.c | 6 | ||||
| -rw-r--r-- | usr.sbin/hostapd/privsep.c | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/usr.sbin/hostapd/iapp.c b/usr.sbin/hostapd/iapp.c index b3ad1f77ac0..5605b29a0b3 100644 --- a/usr.sbin/hostapd/iapp.c +++ b/usr.sbin/hostapd/iapp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iapp.c,v 1.3 2005/04/13 20:25:31 deraadt Exp $ */ +/* $OpenBSD: iapp.c,v 1.4 2005/04/13 21:02:44 moritz Exp $ */ /* * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net> @@ -177,9 +177,9 @@ hostapd_iapp_input(int fd, short sig, void *arg) ret = 0; hostapd_log(HOSTAPD_LOG, "%s/%s: %s ADD notification " - "for %s at %s (%s)\n", - ret == 0 ? "received" : "ignored", + "for %s at %s\n", cfg->c_apme_iface, cfg->c_iapp_iface, + ret == 0 ? "received" : "ignored", ether_ntoa((struct ether_addr*)node.ni_macaddr), inet_ntoa(addr.sin_addr)); break; diff --git a/usr.sbin/hostapd/privsep.c b/usr.sbin/hostapd/privsep.c index f45deafe890..849be5a868a 100644 --- a/usr.sbin/hostapd/privsep.c +++ b/usr.sbin/hostapd/privsep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: privsep.c,v 1.7 2005/04/13 20:42:16 reyk Exp $ */ +/* $OpenBSD: privsep.c,v 1.8 2005/04/13 21:02:44 moritz Exp $ */ /* * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net> @@ -139,7 +139,7 @@ hostapd_priv_init(struct hostapd_config *cfg) event_init(); - /* Pass ALR/TERM/HUP through to child, and accept CHLD */ + /* Pass ALRM/TERM/INT/HUP through to child, and accept CHLD */ signal(SIGALRM, hostapd_sig_relay); signal(SIGTERM, hostapd_sig_relay); signal(SIGINT, hostapd_sig_relay); @@ -336,9 +336,8 @@ hostapd_priv_apme_bssid(struct hostapd_config *cfg) hostapd_must_read(priv_fd, &ret, sizeof(int)); if (ret != 0) - hostapd_fatal("%s: failed to get Host AP's BSSID on" - " \"%s\": %s\n", - cfg->c_apme_iface, strerror(errno)); + hostapd_fatal("failed to get Host AP's BSSID on" + " \"%s\": %s\n", cfg->c_apme_iface, strerror(errno)); hostapd_must_read(priv_fd, &cfg->c_apme_bssid, IEEE80211_ADDR_LEN); cfg->c_stats.cn_tx_apme++; |