From ba13edf3d06a3937022ed43a4a2c51c4ec9de8f3 Mon Sep 17 00:00:00 2001 From: Stefan Sperling Date: Thu, 27 Feb 2020 08:28:36 +0000 Subject: Do not set A_JOIN unconditionally. Otherwise join "" takes effect even though that is not what the user intended, e.g. if an invalid hex SSID was given on the command line. ok sthen@ --- sbin/ifconfig/ifconfig.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index dc6ac509280..aefa23d157a 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.420 2020/02/24 10:39:00 stsp Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.421 2020/02/27 08:28:35 stsp Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -400,7 +400,7 @@ const struct cmd { { "mtu", NEXTARG, 0, setifmtu }, { "nwid", NEXTARG, 0, setifnwid }, { "-nwid", -1, 0, setifnwid }, - { "join", NEXTARG, A_JOIN, setifjoin }, + { "join", NEXTARG, 0, setifjoin }, { "-join", NEXTARG, 0, delifjoin }, { "joinlist", NEXTARG0, 0, showjoin }, { "-joinlist", -1, 0, delifjoinlist }, -- cgit v1.2.3