Page MenuHomeFreeBSD
Files F150064224

D26833.diff
No OneTemporary
Actions

D26833.diff
View Options

Index: head/sbin/sysctl/sysctl.c
===================================================================
--- head/sbin/sysctl/sysctl.c
+++ head/sbin/sysctl/sysctl.c
@@ -952,6 +952,7 @@
static int
show_var(int *oid, int nlen, bool honor_skip)
{
+ static int skip_len = 0, skip_oid[CTL_MAXNAME];
u_char buf[BUFSIZ], *val, *oval, *p;
char name[BUFSIZ], fmt[BUFSIZ];
const char *sep, *sep1, *prntype;
@@ -1021,9 +1022,21 @@
return (0);
}
+ /* keep track of encountered skip nodes, ignoring descendants */
+ if (skip_len == 0 && (kind & CTLFLAG_SKIP) != 0) {
+ /* Save this oid so we can skip descendants. */
+ skip_len = nlen * sizeof(int);
+ memcpy(skip_oid, oid, skip_len);
+ }
+
/* bail before fetching the value if we're honoring skip */
- if (honor_skip && (kind & CTLFLAG_SKIP) != 0)
- return (1);
+ if (honor_skip) {
+ if (0 < skip_len && skip_len <= nlen * (int)sizeof(int) &&
+ memcmp(skip_oid, oid, skip_len) == 0)
+ return (1);
+ /* Not a skip node or descendant of a skip node. */
+ skip_len = 0;
+ }
/* don't fetch opaques that we don't know how to print */
if (ctltype == CTLTYPE_OPAQUE) {
Index: head/sys/kern/kern_sysctl.c
===================================================================
--- head/sys/kern/kern_sysctl.c
+++ head/sys/kern/kern_sysctl.c
@@ -1126,9 +1126,13 @@
* We have reached a node with a full name match and are
* looking for the next oid in its children.
*
+ * For CTL_SYSCTL_NEXTNOSKIP we are done.
+ *
* For CTL_SYSCTL_NEXT we skip CTLTYPE_NODE (unless it
* has a handler) and move on to the children.
*/
+ if (!honor_skip)
+ return (0);
if ((oidp->oid_kind & CTLTYPE) != CTLTYPE_NODE)
return (0);
if (oidp->oid_handler)
@@ -1163,9 +1167,13 @@
/*
* We have reached the next oid.
*
+ * For CTL_SYSCTL_NEXTNOSKIP we are done.
+ *
* For CTL_SYSCTL_NEXT we skip CTLTYPE_NODE (unless it
* has a handler) and move on to the children.
*/
+ if (!honor_skip)
+ return (0);
if ((oidp->oid_kind & CTLTYPE) != CTLTYPE_NODE)
return (0);
if (oidp->oid_handler)

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 30, 2:39 AM (2 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30510584
Default Alt Text
D26833.diff (2 KB)

Event Timeline