Module Name: src
Committed By: riz
Date: Wed Nov 4 16:40:58 UTC 2015
Modified Files:
src/lib/libutil [netbsd-7]: login_cap.c
src/share/man/man5 [netbsd-7]: login.conf.5
Log Message:
Pull up following revision(s) (requested by kamil in ticket #927):
share/man/man5/login.conf.5: revision 1.29
share/man/man7/sysctl.7: revision 1.88
share/man/man5/login.conf.5: revision 1.30
lib/libutil/login_cap.c: revision 1.32
share/man/man5/login.conf.5: revision 1.31
share/doc/psd/05.sysman/1.6.t: revision 1.6
Clean-up resources (sys/sys/resource.h) usage
Add vmemoryuse to login_cap(3)
Document vmemoryuse in login.conf(5)
Reviewed by <riastradh>
Approved by <pgoyette>
Tested by Dominik Bialy
Closes PR xsrc/49912
Bump date for previous.
Clean-up documentation of login.conf(5)
Remove redundant word "limit" from sentences "Maximum ...".
Note that vmemoryuse might specify both maximum and current limits.
Remove redundant 'in bytes' from the description of vmemoryuse, it's not
ed
in the next section describing the argument type 'size'.
Changes inspired by <riastradh> in PR xsrc/49912
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.6.1 src/lib/libutil/login_cap.c
cvs rdiff -u -r1.28 -r1.28.6.1 src/share/man/man5/login.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libutil/login_cap.c
diff -u src/lib/libutil/login_cap.c:1.31 src/lib/libutil/login_cap.c:1.31.6.1
--- src/lib/libutil/login_cap.c:1.31 Sat Jun 29 04:52:55 2013
+++ src/lib/libutil/login_cap.c Wed Nov 4 16:40:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: login_cap.c,v 1.31 2013/06/29 04:52:55 yamt Exp $ */
+/* $NetBSD: login_cap.c,v 1.31.6.1 2015/11/04 16:40:58 riz Exp $ */
/*-
* Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: login_cap.c,v 1.31 2013/06/29 04:52:55 yamt Exp $");
+__RCSID("$NetBSD: login_cap.c,v 1.31.6.1 2015/11/04 16:40:58 riz Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -424,6 +424,7 @@ static struct {
{ RLIMIT_NOFILE, R_CNUMB, "openfiles", },
{ RLIMIT_CORE, R_CSIZE, "coredumpsize", },
{ RLIMIT_SBSIZE, R_CSIZE, "sbsize", },
+ { RLIMIT_AS, R_CSIZE, "vmemoryuse", },
{ -1, 0, 0 }
};
Index: src/share/man/man5/login.conf.5
diff -u src/share/man/man5/login.conf.5:1.28 src/share/man/man5/login.conf.5:1.28.6.1
--- src/share/man/man5/login.conf.5:1.28 Sat Jun 29 08:14:31 2013
+++ src/share/man/man5/login.conf.5 Wed Nov 4 16:40:58 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: login.conf.5,v 1.28 2013/06/29 08:14:31 wiz Exp $
+.\" $NetBSD: login.conf.5,v 1.28.6.1 2015/11/04 16:40:58 riz Exp $
.\"
.\" Copyright (c) 1995,1996,1997 Berkeley Software Design, Inc.
.\" All rights reserved.
@@ -33,7 +33,7 @@
.\"
.\" BSDI login.conf.5,v 2.19 1998/02/19 23:39:39 prb Exp
.\"
-.Dd June 29, 2013
+.Dd July 11, 2015
.Dt LOGIN.CONF 5
.Os
.Sh NAME
@@ -94,7 +94,7 @@ displays it before the welcome message.)
.\"
.sp
.It Sy coredumpsize Ta size Ta "" Ta
-Maximum coredump size limit.
+Maximum coredump size.
.\"
.sp
.It Sy cputime Ta time Ta "" Ta
@@ -102,11 +102,11 @@ CPU usage limit.
.\"
.sp
.It Sy datasize Ta size Ta "" Ta
-Maximum data size limit.
+Maximum data size.
.\"
.sp
.It Sy filesize Ta size Ta "" Ta
-Maximum file size limit.
+Maximum file size.
.\"
.sp
.It Sy host.allow Ta string Ta "" Ta
@@ -173,11 +173,11 @@ The first thread of each process is not
.\"
.sp
.It Sy memorylocked Ta size Ta "" Ta
-Maximum locked in core memory size limit.
+Maximum locked in core memory size.
.\"
.sp
.It Sy memoryuse Ta size Ta "" Ta
-Maximum in core memoryuse size limit.
+Maximum in core memoryuse size.
.\"
.sp
.It Sy minpasswordlen Ta number Ta "" Ta
@@ -229,7 +229,7 @@ Require home directory to login.
.\"
.sp
.It Sy sbsize Ta size Ta "" Ta
-Maximum socket buffer size limit.
+Maximum socket buffer size.
.\"
.sp
.It Sy setenv Ta list Ta "" Ta
@@ -246,7 +246,7 @@ environment variable will contain the sh
.\"
.sp
.It Sy stacksize Ta size Ta "" Ta
-Maximum stack size limit.
+Maximum stack size.
.\"
.sp
.It Sy tc Ta string Ta "" Ta
@@ -271,6 +271,10 @@ See
.Xr umask 2 .
.\"
.sp
+.It Sy vmemoryuse Ta size Ta "" Ta
+Maximum virtual address space size.
+.\"
+.sp
.It Sy welcome Ta file Ta Li /etc/motd Ta
File containing welcome message.
.Xr login 1
@@ -289,8 +293,9 @@ The resource limit entries
.Sy memoryuse ,
.Sy openfiles ,
.Sy sbsize ,
+.Sy stacksize
and
-.Sy stacksize )
+.Sy vmemoryuse )
actually specify both the maximum and current limits (see
.Xr getrlimit 2 ) .
The current limit is the one normally used,
