From owner-svn-src-stable@freebsd.org  Wed Mar 29 08:00:12 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 63586D23D11;
 Wed, 29 Mar 2017 08:00:12 +0000 (UTC)
 (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 302026714B;
 Wed, 29 Mar 2017 08:00:12 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2T80BBQ050420;
 Wed, 29 Mar 2017 08:00:11 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2T80Blx050419;
 Wed, 29 Mar 2017 08:00:11 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201703290800.v2T80Blx050419@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Wed, 29 Mar 2017 08:00:11 +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: r316127 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Mar 2017 08:00:12 -0000

Author: ngie
Date: Wed Mar 29 08:00:11 2017
New Revision: 316127
URL: https://svnweb.freebsd.org/changeset/base/316127

Log:
  MFC r315699:
  
  Print out name of non-dynamic sysctl in sysctl_remove_oid_locked
  
  This will provide a slightly better smoking gun than just stating
  "can't remove non-dynamic nodes!" when calling sysctl_ctx_free(9)
  and sysctl_remove_{name,oid}(9) with a non-dynamic (likely
  static) sysctl.

Modified:
  stable/10/sys/kern/kern_sysctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_sysctl.c
==============================================================================
--- stable/10/sys/kern/kern_sysctl.c	Wed Mar 29 07:30:59 2017	(r316126)
+++ stable/10/sys/kern/kern_sysctl.c	Wed Mar 29 08:00:11 2017	(r316127)
@@ -429,7 +429,8 @@ sysctl_remove_oid_locked(struct sysctl_o
 	if (oidp == NULL)
 		return(EINVAL);
 	if ((oidp->oid_kind & CTLFLAG_DYN) == 0) {
-		printf("can't remove non-dynamic nodes!\n");
+		printf("Warning: can't remove non-dynamic nodes (%s)!\n",
+		    oidp->oid_name);
 		return (EINVAL);
 	}
 	/*