From f70ce9c5e8d20abfa814e9cec0847f05341fff2d Mon Sep 17 00:00:00 2001
From: sthen <>
Date: Mon, 6 Feb 2017 18:11:33 +0000
Subject: [PATCH] List openfiles-max explicitly in default /etc/login.conf
 files. Otherwise, raising openfiles-cur above the implicit -max value (1024
 on at least the common arch) results in the setting not being applied at all.

Earlier version OK tom@ danj@ ajacoutot@ benno@ krw@ beck@, suggestion about
openfiles= from millert@ - changes in this version are to use 1024 for -max
rather than 512 to avoid changing the existing hard limit, and just use
openfiles= for bgpd/unbound where max and cur are the same value.
---
 src/etc/etc.alpha/login.conf    | 8 +++++---
 src/etc/etc.amd64/login.conf    | 8 +++++---
 src/etc/etc.arm64/login.conf    | 8 +++++---
 src/etc/etc.armv7/login.conf    | 8 +++++---
 src/etc/etc.hppa/login.conf     | 8 +++++---
 src/etc/etc.i386/login.conf     | 8 +++++---
 src/etc/etc.landisk/login.conf  | 8 +++++---
 src/etc/etc.loongson/login.conf | 8 +++++---
 src/etc/etc.luna88k/login.conf  | 8 +++++---
 src/etc/etc.macppc/login.conf   | 8 +++++---
 src/etc/etc.octeon/login.conf   | 8 +++++---
 src/etc/etc.sgi/login.conf      | 8 +++++---
 src/etc/etc.socppc/login.conf   | 8 +++++---
 src/etc/etc.sparc64/login.conf  | 8 +++++---
 14 files changed, 70 insertions(+), 42 deletions(-)

diff --git a/src/etc/etc.alpha/login.conf b/src/etc/etc.alpha/login.conf
index 07d1515b..58c8b629 100644
--- a/src/etc/etc.alpha/login.conf
+++ b/src/etc/etc.alpha/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:49 sthen Exp $
+# $OpenBSD: login.conf,v 1.6 2017/02/06 18:11:33 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -45,6 +45,7 @@ default:\
 	:datasize-cur=512M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
+	:openfiles-max=1024:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
@@ -60,6 +61,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
+	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,9:\
@@ -99,9 +101,9 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
 
 unbound:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
diff --git a/src/etc/etc.amd64/login.conf b/src/etc/etc.amd64/login.conf
index a1fd4020..94da94ed 100644
--- a/src/etc/etc.amd64/login.conf
+++ b/src/etc/etc.amd64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.8 2016/11/25 21:51:29 bluhm Exp $
+# $OpenBSD: login.conf,v 1.9 2017/02/06 18:11:33 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -45,6 +45,7 @@ default:\
 	:datasize-cur=768M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
+	:openfiles-max=1024:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,a:\
@@ -60,6 +61,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
+	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,a:\
@@ -99,9 +101,9 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
 
 unbound:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
diff --git a/src/etc/etc.arm64/login.conf b/src/etc/etc.arm64/login.conf
index 882bb093..3b8f97b9 100644
--- a/src/etc/etc.arm64/login.conf
+++ b/src/etc/etc.arm64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.1 2017/01/11 17:05:29 patrick Exp $
+# $OpenBSD: login.conf,v 1.2 2017/02/06 18:11:33 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -45,6 +45,7 @@ default:\
 	:datasize-cur=512M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
+	:openfiles-max=1024:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
@@ -60,6 +61,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
+	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,9:\
@@ -99,9 +101,9 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
 
 unbound:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
diff --git a/src/etc/etc.armv7/login.conf b/src/etc/etc.armv7/login.conf
index 07d1515b..58c8b629 100644
--- a/src/etc/etc.armv7/login.conf
+++ b/src/etc/etc.armv7/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:49 sthen Exp $
+# $OpenBSD: login.conf,v 1.6 2017/02/06 18:11:33 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -45,6 +45,7 @@ default:\
 	:datasize-cur=512M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
+	:openfiles-max=1024:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
@@ -60,6 +61,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
+	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,9:\
@@ -99,9 +101,9 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
 
 unbound:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
diff --git a/src/etc/etc.hppa/login.conf b/src/etc/etc.hppa/login.conf
index 0f98caeb..58c8b629 100644
--- a/src/etc/etc.hppa/login.conf
+++ b/src/etc/etc.hppa/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
+# $OpenBSD: login.conf,v 1.6 2017/02/06 18:11:33 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -45,6 +45,7 @@ default:\
 	:datasize-cur=512M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
+	:openfiles-max=1024:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
@@ -60,6 +61,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
+	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,9:\
@@ -99,9 +101,9 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
 
 unbound:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
diff --git a/src/etc/etc.i386/login.conf b/src/etc/etc.i386/login.conf
index b74eacd3..974c78d6 100644
--- a/src/etc/etc.i386/login.conf
+++ b/src/etc/etc.i386/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.6 2016/06/26 20:32:31 tedu Exp $
+# $OpenBSD: login.conf,v 1.7 2017/02/06 18:11:33 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -45,6 +45,7 @@ default:\
 	:datasize-cur=512M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
+	:openfiles-max=1024:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,a:\
@@ -60,6 +61,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
+	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,a:\
@@ -99,9 +101,9 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
 
 unbound:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
diff --git a/src/etc/etc.landisk/login.conf b/src/etc/etc.landisk/login.conf
index 0f98caeb..58c8b629 100644
--- a/src/etc/etc.landisk/login.conf
+++ b/src/etc/etc.landisk/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
+# $OpenBSD: login.conf,v 1.6 2017/02/06 18:11:33 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -45,6 +45,7 @@ default:\
 	:datasize-cur=512M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
+	:openfiles-max=1024:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
@@ -60,6 +61,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
+	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,9:\
@@ -99,9 +101,9 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
 
 unbound:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
diff --git a/src/etc/etc.loongson/login.conf b/src/etc/etc.loongson/login.conf
index 0f98caeb..58c8b629 100644
--- a/src/etc/etc.loongson/login.conf
+++ b/src/etc/etc.loongson/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
+# $OpenBSD: login.conf,v 1.6 2017/02/06 18:11:33 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -45,6 +45,7 @@ default:\
 	:datasize-cur=512M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
+	:openfiles-max=1024:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
@@ -60,6 +61,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
+	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,9:\
@@ -99,9 +101,9 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
 
 unbound:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
diff --git a/src/etc/etc.luna88k/login.conf b/src/etc/etc.luna88k/login.conf
index 0f98caeb..58c8b629 100644
--- a/src/etc/etc.luna88k/login.conf
+++ b/src/etc/etc.luna88k/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
+# $OpenBSD: login.conf,v 1.6 2017/02/06 18:11:33 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -45,6 +45,7 @@ default:\
 	:datasize-cur=512M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
+	:openfiles-max=1024:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
@@ -60,6 +61,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
+	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,9:\
@@ -99,9 +101,9 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
 
 unbound:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
diff --git a/src/etc/etc.macppc/login.conf b/src/etc/etc.macppc/login.conf
index c9f5cdaf..78600882 100644
--- a/src/etc/etc.macppc/login.conf
+++ b/src/etc/etc.macppc/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.6 2016/06/26 20:32:31 tedu Exp $
+# $OpenBSD: login.conf,v 1.7 2017/02/06 18:11:33 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -45,6 +45,7 @@ default:\
 	:datasize-cur=512M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
+	:openfiles-max=1024:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,a:\
@@ -60,6 +61,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
+	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,a:\
@@ -99,9 +101,9 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
 
 unbound:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
diff --git a/src/etc/etc.octeon/login.conf b/src/etc/etc.octeon/login.conf
index 0f98caeb..58c8b629 100644
--- a/src/etc/etc.octeon/login.conf
+++ b/src/etc/etc.octeon/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
+# $OpenBSD: login.conf,v 1.6 2017/02/06 18:11:33 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -45,6 +45,7 @@ default:\
 	:datasize-cur=512M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
+	:openfiles-max=1024:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
@@ -60,6 +61,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
+	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,9:\
@@ -99,9 +101,9 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
 
 unbound:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
diff --git a/src/etc/etc.sgi/login.conf b/src/etc/etc.sgi/login.conf
index 0f98caeb..58c8b629 100644
--- a/src/etc/etc.sgi/login.conf
+++ b/src/etc/etc.sgi/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
+# $OpenBSD: login.conf,v 1.6 2017/02/06 18:11:33 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -45,6 +45,7 @@ default:\
 	:datasize-cur=512M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
+	:openfiles-max=1024:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
@@ -60,6 +61,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
+	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,9:\
@@ -99,9 +101,9 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
 
 unbound:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
diff --git a/src/etc/etc.socppc/login.conf b/src/etc/etc.socppc/login.conf
index 0f98caeb..58c8b629 100644
--- a/src/etc/etc.socppc/login.conf
+++ b/src/etc/etc.socppc/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
+# $OpenBSD: login.conf,v 1.6 2017/02/06 18:11:33 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -45,6 +45,7 @@ default:\
 	:datasize-cur=512M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
+	:openfiles-max=1024:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,8:\
@@ -60,6 +61,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
+	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,9:\
@@ -99,9 +101,9 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
 
 unbound:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
diff --git a/src/etc/etc.sparc64/login.conf b/src/etc/etc.sparc64/login.conf
index b74eacd3..974c78d6 100644
--- a/src/etc/etc.sparc64/login.conf
+++ b/src/etc/etc.sparc64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.6 2016/06/26 20:32:31 tedu Exp $
+# $OpenBSD: login.conf,v 1.7 2017/02/06 18:11:33 sthen Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -45,6 +45,7 @@ default:\
 	:datasize-cur=512M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
+	:openfiles-max=1024:\
 	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,a:\
@@ -60,6 +61,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
+	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,a:\
@@ -99,9 +101,9 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon:
 
 unbound:\
-	:openfiles-cur=512:\
+	:openfiles=512:\
 	:tc=daemon: