From owner-svn-src-all@FreeBSD.ORG  Mon Jan 14 10:58:20 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id DC01DA09;
 Mon, 14 Jan 2013 10:58:20 +0000 (UTC)
 (envelope-from zont@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CE345300;
 Mon, 14 Jan 2013 10:58:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0EAwKhw044424;
 Mon, 14 Jan 2013 10:58:20 GMT (envelope-from zont@svn.freebsd.org)
Received: (from zont@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0EAwK4q044423;
 Mon, 14 Jan 2013 10:58:20 GMT (envelope-from zont@svn.freebsd.org)
Message-Id: <201301141058.r0EAwK4q044423@svn.freebsd.org>
From: Andrey Zonov <zont@FreeBSD.org>
Date: Mon, 14 Jan 2013 10:58:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r245415 - stable/9/etc
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Jan 2013 10:58:20 -0000

Author: zont
Date: Mon Jan 14 10:58:20 2013
New Revision: 245415
URL: http://svnweb.freebsd.org/changeset/base/245415

Log:
  MFC r244383:
  - Set memorylocked limit to 64Kb for default login class.
    This prevents unprivileged users to lock too much memory.
  - Set memorylocked limit to 64Mb for daemon login class.
    Some daemons such as amd(8) and watchdogd(8) calls mlockall(2) on
    startup, they are run from init(8) which uses daemon login class.
  - Set memorylocked limit to unlimited for root login class.
  
  Approved by:	kib (mentor)

Modified:
  stable/9/etc/login.conf
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/9/etc/login.conf
==============================================================================
--- stable/9/etc/login.conf	Mon Jan 14 09:11:18 2013	(r245414)
+++ stable/9/etc/login.conf	Mon Jan 14 10:58:20 2013	(r245415)
@@ -32,7 +32,7 @@ default:\
 	:cputime=unlimited:\
 	:datasize=unlimited:\
 	:stacksize=unlimited:\
-	:memorylocked=unlimited:\
+	:memorylocked=64K:\
 	:memoryuse=unlimited:\
 	:filesize=unlimited:\
 	:coredumpsize=unlimited:\
@@ -59,6 +59,7 @@ xuser:\
 staff:\
 	:tc=default:
 daemon:\
+	:memorylocked=64M:\
 	:tc=default:
 news:\
 	:tc=default:
@@ -72,6 +73,7 @@ dialer:\
 #       in preference to 'default'.
 root:\
 	:ignorenologin:\
+	:memorylocked=unlimited:\
 	:tc=default:
 
 #