From owner-svn-src-head@freebsd.org  Sat Sep 22 16:30:49 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 82384109C8FB;
 Sat, 22 Sep 2018 16:30:49 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 34ED2790B8;
 Sat, 22 Sep 2018 16:30:49 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2FD671E4BF;
 Sat, 22 Sep 2018 16:30:49 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8MGUnKO000940;
 Sat, 22 Sep 2018 16:30:49 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8MGUn0I000939;
 Sat, 22 Sep 2018 16:30:49 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201809221630.w8MGUn0I000939@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Sat, 22 Sep 2018 16:30:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r338890 - head/sbin/ifconfig
X-SVN-Group: head
X-SVN-Commit-Author: ae
X-SVN-Commit-Paths: head/sbin/ifconfig
X-SVN-Commit-Revision: 338890
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Sep 2018 16:30:49 -0000

Author: ae
Date: Sat Sep 22 16:30:48 2018
New Revision: 338890
URL: https://svnweb.freebsd.org/changeset/base/338890

Log:
  Update ifr_name before invoking IPSECSREQID ioctl, this fixes the case,
  when `ifconfig ipsec create reqid N` command invoked without interface
  unit number. The "name" global variable is updated after interface
  cloning in the ifclonecreate() and contains actual interface name.
  
  Reported by:	lev
  Approved by:	re (kib)
  MFC after:	1 week

Modified:
  head/sbin/ifconfig/ifipsec.c

Modified: head/sbin/ifconfig/ifipsec.c
==============================================================================
--- head/sbin/ifconfig/ifipsec.c	Sat Sep 22 16:19:21 2018	(r338889)
+++ head/sbin/ifconfig/ifipsec.c	Sat Sep 22 16:30:48 2018	(r338890)
@@ -72,6 +72,7 @@ DECL_CMD_FUNC(setreqid, val, arg)
 		warn("Invalid reqid value %s", val);
 		return;
 	}
+	strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
 	ifr.ifr_data = (char *)&v;
 	if (ioctl(s, IPSECSREQID, &ifr) == -1) {
 		warn("ioctl(IPSECSREQID)");