svn commit: r268243 - stable/10/sbin/sysctl

[Hans Petter Selasky]

Author: hselasky
Date: Fri Jul  4 06:03:54 2014
New Revision: 268243
URL: http://svnweb.freebsd.org/changeset/base/268243

Log:
  MFC r267960:
  Don't hide zero-length strings when doing sysctl listings.

Modified:
  stable/10/sbin/sysctl/sysctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/sysctl/sysctl.c
==============================================================================
--- stable/10/sbin/sysctl/sysctl.c	Fri Jul  4 04:47:29 2014	(r268242)
+++ stable/10/sbin/sysctl/sysctl.c	Fri Jul  4 06:03:54 2014	(r268243)
@@ -710,9 +710,10 @@ show_var(int *oid, int nlen)
 		warnx("malloc failed");
 		return (1);
 	}
+	ctltype = (kind & CTLTYPE);
 	len = j;
 	i = sysctl(oid, nlen, val, &len, 0, 0);
-	if (i || !len) {
+	if (i != 0 || (len == 0 && ctltype != CTLTYPE_STRING)) {
 		free(oval);
 		return (1);
 	}
@@ -724,7 +725,6 @@ show_var(int *oid, int nlen)
 	}
 	val[len] = '\0';
 	p = val;
-	ctltype = (kind & CTLTYPE);
 	sign = ctl_sign[ctltype];
 	intlen = ctl_size[ctltype];