diff options
| author | imp <imp@FreeBSD.org> | 2007-05-17 05:05:12 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2007-05-17 05:05:12 +0000 |
| commit | 52b1304476676969a831d9f5fa20dd28839dabe4 (patch) | |
| tree | 18ff1d33f9f4b77fa7c6aa7c9c4ac44192e19e77 /sys | |
| parent | 1b2d04e22037b4fc696e8b366c5dc1dae822e592 (diff) | |
| download | FreeBSD-src-52b1304476676969a831d9f5fa20dd28839dabe4.zip FreeBSD-src-52b1304476676969a831d9f5fa20dd28839dabe4.tar.gz | |
Don't export a kern.conftxt sysctl, except when INCLUDE_CONF_FILE is
defined. This restores the old behavior, and eliminates the
dependency on the kernconf.tmpl when INCLUDE_CONFIG_FILE isn't
included in the kernel config. There were many people in the terminal
room that had almost, but not quite, up-to-date config files that this
helps. I don't know if this is the result of skew among the cvsup
servers, or some other more subtle problem. However, this fix should
work for any config of recent vintage (I tested with the latest, and
one before the recent changes, and eye-balled the intermediate
versions).
Reviewed by: the terminal room crew
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_mib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index c10e5f2..97acaae 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -300,9 +300,6 @@ SYSCTL_PROC(_kern, KERN_SECURELVL, securelevel, #ifdef INCLUDE_CONFIG_FILE /* Actual kernel configuration options. */ extern char kernconfstring[]; -#else -char kernconfstring[] = "\0"; -#endif static int sysctl_kern_config(SYSCTL_HANDLER_ARGS) @@ -332,6 +329,7 @@ sysctl_kern_config(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_kern, OID_AUTO, conftxt, CTLTYPE_STRING|CTLFLAG_RW, 0, 0, sysctl_kern_config, "", "Kernel configuration file"); +#endif char domainname[MAXHOSTNAMELEN]; SYSCTL_STRING(_kern, KERN_NISDOMAINNAME, domainname, CTLFLAG_RW, |
