diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2018-11-08 05:58:22 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2018-11-08 05:58:22 +0000 |
| commit | d720cdbe908235abe8a2a60279b26d91568392d1 (patch) | |
| tree | 7229189dac14da4d15751237438f728801d71a1f /lib/libc | |
| parent | 1fe768532951271d1b1390909cbcdc7e3cce9675 (diff) | |
zap last remains of malloc.conf; prompted by and ok jmc@
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/stdlib/malloc.3 | 12 | ||||
| -rw-r--r-- | lib/libc/sys/pledge.2 | 7 |
2 files changed, 8 insertions, 11 deletions
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3 index 5c33f11352e..35222a15cee 100644 --- a/lib/libc/stdlib/malloc.3 +++ b/lib/libc/stdlib/malloc.3 @@ -30,9 +30,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: malloc.3,v 1.117 2018/11/06 12:02:30 otto Exp $ +.\" $OpenBSD: malloc.3,v 1.118 2018/11/08 05:58:21 otto Exp $ .\" -.Dd $Mdocdate: November 6 2018 $ +.Dd $Mdocdate: November 8 2018 $ .Dt MALLOC 3 .Os .Sh NAME @@ -401,7 +401,7 @@ it guarantees memory is cleared before placing it on the internal free list. Deallocation of such an object should be done by calling .Fn freezero . .Sh ENVIRONMENT -.Bl -tag -width "/etc/malloc.conf" +.Bl -tag -width "MALLOC_OPTIONS" .It Ev MALLOC_OPTIONS String of flags documented in .Xr malloc.conf 5 . @@ -554,9 +554,9 @@ in this case. .Pp The .Ev MALLOC_OPTIONS -environment variable, the file -.Pa /etc/malloc.conf , -and the +environment variable, the +.Va vm.malloc_conf +sysctl and the .Sx DIAGNOSTICS output are extensions to the standard. .Sh HISTORY diff --git a/lib/libc/sys/pledge.2 b/lib/libc/sys/pledge.2 index 3c32586c478..d6b4bc2966d 100644 --- a/lib/libc/sys/pledge.2 +++ b/lib/libc/sys/pledge.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pledge.2,v 1.53 2018/07/13 09:25:22 beck Exp $ +.\" $OpenBSD: pledge.2,v 1.54 2018/11/08 05:58:21 otto Exp $ .\" .\" Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: July 13 2018 $ +.Dd $Mdocdate: November 8 2018 $ .Dt PLEDGE 2 .Os .Sh NAME @@ -135,9 +135,6 @@ Can only reduce permissions for .Ar promises and .Ar execpromises . -.It Xr readlink 2 : -May operate on -.Pa /etc/malloc.conf . .It Xr sysctl 2 : A small set of read-only operations are allowed, sufficient to support: |