summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2013-07-16 08:21:10 +0000
committermpi <mpi@openbsd.org>2013-07-16 08:21:10 +0000
commit7a5c3b4def532a5194fee8b648e87f1d6e5e87f1 (patch)
tree97239fd96249691348f0ce7331d8ea427b293c08
parentCorrectly initialized the width value to 0 instead of passing garbage (diff)
downloadwireguard-openbsd-7a5c3b4def532a5194fee8b648e87f1d6e5e87f1.tar.xz
wireguard-openbsd-7a5c3b4def532a5194fee8b648e87f1d6e5e87f1.zip
Make sure the ioctl(2) has been processed by sppp(4) before printing
any phase error. This prevents ifconfig(8) from priting 'sppp: phase...' messages for vlan(4) interfaces attached to interfaces with a long name. A better fix should be cooked because various pseudo-interfaces still use the same set of ioctl(2)s for different purposes. Issue reported by jca@, ok claudio@, jca@
-rw-r--r--sbin/ifconfig/ifconfig.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 54e4b994150..28634bb5eb7 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ifconfig.c,v 1.266 2013/07/10 07:46:10 mpi Exp $ */
+/* $OpenBSD: ifconfig.c,v 1.267 2013/07/16 08:21:10 mpi Exp $ */
/* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */
/*
@@ -4216,7 +4216,7 @@ sppp_status(void)
return;
}
- if (spr.phase == PHASE_DEAD)
+ if (spr.cmd != SPPPIOGDEFS || spr.phase == PHASE_DEAD)
return;
printf("\tsppp: phase ");
switch (spr.phase) {