Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7]: src Pull up following revision(s) (requested by kamil in tick...



details:   https://anonhg.NetBSD.org/src/rev/9c1b01a8cbdb
branches:  netbsd-7
changeset: 799613:9c1b01a8cbdb
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Nov 04 16:40:58 2015 +0000

description:
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

diffstat:

 lib/libutil/login_cap.c     |   5 +++--
 share/man/man5/login.conf.5 |  25 +++++++++++++++----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diffs (121 lines):

diff -r 76bbdeda51ef -r 9c1b01a8cbdb lib/libutil/login_cap.c
--- a/lib/libutil/login_cap.c   Wed Nov 04 16:29:56 2015 +0000
+++ b/lib/libutil/login_cap.c   Wed Nov 04 16:40:58 2015 +0000
@@ -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 @@
        { RLIMIT_NOFILE,        R_CNUMB, "openfiles", },
        { RLIMIT_CORE,          R_CSIZE, "coredumpsize", },
        { RLIMIT_SBSIZE,        R_CSIZE, "sbsize", },
+       { RLIMIT_AS,            R_CSIZE, "vmemoryuse", },
        { -1, 0, 0 }
 };
 
diff -r 76bbdeda51ef -r 9c1b01a8cbdb share/man/man5/login.conf.5
--- a/share/man/man5/login.conf.5       Wed Nov 04 16:29:56 2015 +0000
+++ b/share/man/man5/login.conf.5       Wed Nov 04 16:40:58 2015 +0000
@@ -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 @@
 .\"
 .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 @@
 .\"
 .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 @@
 .\"
 .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 @@
 .\"
 .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 @@
 .\"
 .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 @@
 .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 @@
 .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,



Home | Main Index | Thread Index | Old Index