From b99a9d2b5b2c80af2380f10347e30963e2d5fc95 Mon Sep 17 00:00:00 2001
From: bapt <bapt@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 14 Oct 2015 06:31:49 +0000
Subject: [PATCH] MFC: 288984

Only print the errno string in case sysctl(3) does not file with ENOENT
This reduces the noise in error reporing from sysctl(8):

Before:
$ sysctl bla=something
sysctl: unknown oid 'bla': No such file or directory

After:
$ sysctl bla=something
sysctl: unknown oid 'bla'

Sponsored by:	Gandi.net


git-svn-id: svn://svn.freebsd.org/base/stable/10@289292 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sbin/sysctl/sysctl.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 97628a297..c0bcc8182 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -247,7 +247,11 @@ parse(const char *string, int lineno)
 		if (qflag)
 			return (1);
 		else {
-			warn("unknown oid '%s'%s", bufp, line);
+			if (errno == ENOENT) {
+				warnx("unknown oid '%s'%s", bufp, line);
+			} else {
+				warn("unknown oid '%s'%s", bufp, line);
+			}
 			return (1);
 		}
 	}
-- 
2.45.0