From owner-svn-src-all@freebsd.org Mon Sep 21 03:03:58 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A3C3A06804; Mon, 21 Sep 2015 03:03:58 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2AE2F1C57; Mon, 21 Sep 2015 03:03:58 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8L33wqE054239; Mon, 21 Sep 2015 03:03:58 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8L33wCA054238; Mon, 21 Sep 2015 03:03:58 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201509210303.t8L33wCA054238@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Mon, 21 Sep 2015 03:03:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r288055 - stable/10/sbin/ifconfig X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Sep 2015 03:03:58 -0000 Author: hrs Date: Mon Sep 21 03:03:57 2015 New Revision: 288055 URL: https://svnweb.freebsd.org/changeset/base/288055 Log: Re-add deprecated options as no-op to prevent breakage of backward compatibility. Spotted by: ume Modified: stable/10/sbin/ifconfig/ifgif.c Modified: stable/10/sbin/ifconfig/ifgif.c ============================================================================== --- stable/10/sbin/ifconfig/ifgif.c Mon Sep 21 02:33:11 2015 (r288054) +++ stable/10/sbin/ifconfig/ifgif.c Mon Sep 21 03:03:57 2015 (r288055) @@ -74,6 +74,8 @@ setgifopts(const char *val, int d, int s { int opts; + if (d == 0) + return; ifr.ifr_data = (caddr_t)&opts; if (ioctl(s, GIFGOPTS, &ifr) == -1) { warn("ioctl(GIFGOPTS)"); @@ -92,8 +94,12 @@ setgifopts(const char *val, int d, int s } static struct cmd gif_cmds[] = { + DEF_CMD("accept_rev_ethip_ver", 0, setgifopts), + DEF_CMD("-accept_rev_ethip_ver",0, setgifopts), DEF_CMD("ignore_source", GIF_IGNORE_SOURCE, setgifopts), DEF_CMD("-ignore_source", -GIF_IGNORE_SOURCE, setgifopts), + DEF_CMD("send_rev_ethip_ver", 0, setgifopts), + DEF_CMD("-send_rev_ethip_ver", 0, setgifopts), }; static struct afswtch af_gif = {