From d8877c6c9a488e2f8bead840bb347cb9dc9f70e2 Mon Sep 17 00:00:00 2001
From: danj <>
Date: Sat, 23 May 2020 13:16:03 +0000
Subject: [PATCH] Remove useless line from daemon class in login.conf

We used to have different numbers of blowfish rounds between the
default and daemon classes in login.conf. On Jun 26, 2016, tedu
committed "upgrade selected login.conf to use auto rounds for bcrypt"
for amd64, sparc64, i386, and maccpc.

Since the class daemon inherits from the default class, the
:localcipher=blowfish,a:\
is a duplicate.

ok millert@ deraadt@ sthen@
---
 src/etc/etc.amd64/login.conf   | 3 +--
 src/etc/etc.i386/login.conf    | 3 +--
 src/etc/etc.macppc/login.conf  | 3 +--
 src/etc/etc.sparc64/login.conf | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/etc/etc.amd64/login.conf b/src/etc/etc.amd64/login.conf
index d9c99b1d..b14e4b85 100644
--- a/src/etc/etc.amd64/login.conf
+++ b/src/etc/etc.amd64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.14 2020/03/11 15:41:48 naddy Exp $
+# $OpenBSD: login.conf,v 1.15 2020/05/23 13:16:03 danj Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -64,7 +64,6 @@ daemon:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
-	:localcipher=blowfish,a:\
 	:tc=default:
 
 #
diff --git a/src/etc/etc.i386/login.conf b/src/etc/etc.i386/login.conf
index f639970b..60830159 100644
--- a/src/etc/etc.i386/login.conf
+++ b/src/etc/etc.i386/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.9 2019/11/05 19:03:46 solene Exp $
+# $OpenBSD: login.conf,v 1.10 2020/05/23 13:16:03 danj Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -64,7 +64,6 @@ daemon:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
-	:localcipher=blowfish,a:\
 	:tc=default:
 
 #
diff --git a/src/etc/etc.macppc/login.conf b/src/etc/etc.macppc/login.conf
index 54e1a2e7..908cb530 100644
--- a/src/etc/etc.macppc/login.conf
+++ b/src/etc/etc.macppc/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.12 2020/03/12 15:32:22 deraadt Exp $
+# $OpenBSD: login.conf,v 1.13 2020/05/23 13:16:03 danj Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -64,7 +64,6 @@ daemon:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
-	:localcipher=blowfish,a:\
 	:tc=default:
 
 #
diff --git a/src/etc/etc.sparc64/login.conf b/src/etc/etc.sparc64/login.conf
index 4ccfe8f4..e5e76523 100644
--- a/src/etc/etc.sparc64/login.conf
+++ b/src/etc/etc.sparc64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.12 2019/11/05 19:03:47 solene Exp $
+# $OpenBSD: login.conf,v 1.13 2020/05/23 13:16:03 danj Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -64,7 +64,6 @@ daemon:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
 	:stacksize-cur=8M:\
-	:localcipher=blowfish,a:\
 	:tc=default:
 
 #