diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2010-07-02 19:05:21 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2010-07-02 19:05:21 +0000 |
| commit | 60e9a7fdfa994a34001f5c17cd3a32546ee4e9a0 (patch) | |
| tree | 918e548bafd0245c96b825cf9ee59646c65e0481 /usr.sbin/npppd | |
| parent | 20db90291d3be155d5c7fd7c0948c1601ccf780d (diff) | |
fix mistakes that have been created by my porting to OpenBSD.
- delete a change only for debug
- add missing 'else'
Diffstat (limited to 'usr.sbin/npppd')
| -rw-r--r-- | usr.sbin/npppd/npppd/npppd_iface.c | 3 | ||||
| -rw-r--r-- | usr.sbin/npppd/npppdctl/npppdctl.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/npppd/npppd/npppd_iface.c b/usr.sbin/npppd/npppd/npppd_iface.c index 9a57cefcd71..48f22644577 100644 --- a/usr.sbin/npppd/npppd/npppd_iface.c +++ b/usr.sbin/npppd/npppd/npppd_iface.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $Id: npppd_iface.c,v 1.2 2010/07/01 03:38:17 yasuoka Exp $ */ +/* $Id: npppd_iface.c,v 1.3 2010/07/02 19:05:20 yasuoka Exp $ */ /**@file * The interface of npppd and kernel. * This is an implementation to use tun(4). @@ -504,7 +504,6 @@ npppd_iface_network_input_ipv4(npppd_iface *_this, u_char *pktp, int lpktp) #ifdef NPPPD_DEBUG log_printf(LOG_INFO, "%s received a packet to unknown " "%s.", _this->ifname, inet_ntoa(iphdr->ip_dst)); - show_hd(debug_get_debugfp(), pktp, lpktp); #endif return; } diff --git a/usr.sbin/npppd/npppdctl/npppdctl.c b/usr.sbin/npppd/npppdctl/npppdctl.c index b5119ed1860..40e03af9b3f 100644 --- a/usr.sbin/npppd/npppdctl/npppdctl.c +++ b/usr.sbin/npppd/npppdctl/npppdctl.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $Id: npppdctl.c,v 1.2 2010/07/01 03:38:17 yasuoka Exp $ */ +/* $Id: npppdctl.c,v 1.3 2010/07/02 19:05:20 yasuoka Exp $ */ #include <sys/types.h> #include <sys/param.h> #include <sys/socket.h> @@ -330,7 +330,7 @@ print_who(struct npppd_who *w) LLADDR((struct sockaddr_dl *)sa)[3] & 0xff, LLADDR((struct sockaddr_dl *)sa)[4] & 0xff, LLADDR((struct sockaddr_dl *)sa)[5] & 0xff); - } if (sa->sa_family < AF_MAX) { + } else if (sa->sa_family < AF_MAX) { getnameinfo((const struct sockaddr *)&w->phy_info, sa->sa_len, hoststr, sizeof(hoststr), servstr, sizeof(servstr), |