 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysctl.c,v 1.157 2015/12/13 14:24:47 christos Exp $ */
+/*	$NetBSD: sysctl.c,v 1.158 2016/07/31 23:30:28 dholland Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  *	All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Brown.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -58,27 +58,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)sysctl.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: sysctl.c,v 1.157 2015/12/13 14:24:47 christos Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.158 2016/07/31 23:30:28 dholland Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/mount.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/sched.h>
 #include <sys/socket.h>
 #include <sys/bitops.h>
 #include <netinet/in.h>
 @@ -118,28 +118,28 @@ __RCSID("$NetBSD: sysctl.c,v 1.157 2015/
 	u_int type, void *v
 #define DISPLAY_VALUE	0
 #define DISPLAY_OLD	1
 #define DISPLAY_NEW	2
 /*
  * generic routines
  */
 static const struct handlespec *findhandler(const char *, regex_t *, size_t *);
 static void canonicalize(const char *, char *);
 static void purge_tree(struct sysctlnode *);
 static void print_tree(int *, u_int, struct sysctlnode *, u_int, int, regex_t *,
     size_t *);
-static void write_number(int *, u_int, struct sysctlnode *, char *);
+static void write_number(int *, u_int, struct sysctlnode *, char *, bool);
-static void write_string(int *, u_int, struct sysctlnode *, char *);
+static void write_string(int *, u_int, struct sysctlnode *, char *, bool);
 static void display_number(const struct sysctlnode *, const char *,
 			   const void *, size_t, int);
 static void display_string(const struct sysctlnode *, const char *,
 			   const void *, size_t, int);
 static void display_struct(const struct sysctlnode *, const char *,
 			   const void *, size_t, int);
 static void hex_dump(const unsigned char *, size_t);
 __dead static void usage(void);
 static void parse(char *, regex_t *, size_t *);
 static void parse_create(char *);
 static void parse_destroy(char *);
 static void parse_describe(char *);
 static void getdesc1(int *, u_int, struct sysctlnode *);
 @@ -936,30 +936,30 @@ parse(char *l, regex_t *re, size_t *last
+	}
 	switch (type) {
 	case CTLTYPE_NODE:
 		/*
 		 * XXX old behavior is to print.  should we error instead?
 		 */
 		print_tree(&name[0], namelen, node, CTLTYPE_NODE, 1, re,
 		    lastcompiled);
 		break;
 	case CTLTYPE_INT:
 	case CTLTYPE_BOOL:
 	case CTLTYPE_QUAD:
-		write_number(&name[0], namelen, node, value);
+		write_number(&name[0], namelen, node, value, optional);
 		break;
 	case CTLTYPE_STRING:
-		write_string(&name[0], namelen, node, value);
+		write_string(&name[0], namelen, node, value, optional);
 		break;
 	case CTLTYPE_STRUCT:
 		/*
 		 * XXX old behavior is to print.  should we error instead?
 		 */
 		/* fprintf(warnfp, "you can't write to %s\n", gsname); */
 		print_tree(&name[0], namelen, node, type, 0, re, lastcompiled);
 		break;
+	}
+}
 /*
 @@ -1744,27 +1744,28 @@ sysctlperror(const char *fmt, ...)
 	va_start(ap, fmt);
 	(void)vfprintf(warnfp, fmt, ap);
 	va_end(ap);
 	errs++;
+}
 /*
  * ********************************************************************
  * how to write to a "simple" node
  * ********************************************************************
  */
 static void
-write_number(int *name, u_int namelen, struct sysctlnode *node, char *value)
+write_number(int *name, u_int namelen, struct sysctlnode *node, char *value,
 	bool optional)
+{
 	u_int ii, io;
 	u_quad_t qi, qo;
 	size_t si, so;
 	bool bi, bo;
 	int rc;
 	void *i, *o;
 	char *t;
 	if (fn)
 		trim_whitespace(value, 3);
 	si = so = 0;
 @@ -1801,69 +1802,75 @@ write_number(int *name, u_int namelen, s
 		i = &bi;
 		si = sizeof(bi);
 		break;
 	case CTLTYPE_QUAD:
 		o = &qo;
 		so = sizeof(qo);
 		i = &qi;
 		si = sizeof(qi);
 		break;
+	}
 	rc = prog_sysctl(name, namelen, o, &so, i, si);
 	if (rc == -1) {
-		sysctlerror(0);
+		if (!optional || errno != EPERM) {
 			sysctlerror(0);
+		}
 		return;
+	}
 	switch (SYSCTL_TYPE(node->sysctl_flags)) {
 	case CTLTYPE_INT:
 		display_number(node, gsname, &io, sizeof(io), DISPLAY_OLD);
 		display_number(node, gsname, &ii, sizeof(ii), DISPLAY_NEW);
 		break;
 	case CTLTYPE_BOOL:
 		display_number(node, gsname, &bo, sizeof(bo), DISPLAY_OLD);
 		display_number(node, gsname, &bi, sizeof(bi), DISPLAY_NEW);
 		break;
 	case CTLTYPE_QUAD:
 		display_number(node, gsname, &qo, sizeof(qo), DISPLAY_OLD);
 		display_number(node, gsname, &qi, sizeof(qi), DISPLAY_NEW);
 		break;
+	}
+}
 static void
-write_string(int *name, u_int namelen, struct sysctlnode *node, char *value)
+write_string(int *name, u_int namelen, struct sysctlnode *node, char *value,
 	bool optional)
+{
 	char *i, *o;
 	size_t si, so;
 	int rc;
 	i = value;
 	si = strlen(i) + 1;
 	so = node->sysctl_size;
 	if (si > so && so != 0) {
 		sysctlperror("%s: string too long\n", value);
 		EXIT(EXIT_FAILURE);
+	}
 	o = malloc(so);
 	if (o == NULL) {
 		sysctlperror("%s: !malloc failed!\n", gsname);
 		exit(EXIT_FAILURE);
+	}
 	rc = prog_sysctl(name, namelen, o, &so, i, si);
 	if (rc == -1) {
-		sysctlerror(0);
+		if (!optional || errno != EPERM) {
 			sysctlerror(0);
+		}
 		free(o);
 		return;
+	}
 	display_string(node, gsname, o, so, DISPLAY_OLD);
 	display_string(node, gsname, i, si, DISPLAY_NEW);
 	free(o);
+}
 /*
  * ********************************************************************
  * simple ways to print stuff consistently
  * ********************************************************************
  */