summaryrefslogtreecommitdiff
path: root/distrib/miniroot
diff options
context:
space:
mode:
authorRobert Peichaer <rpe@cvs.openbsd.org>2014-02-02 19:33:24 +0000
committerRobert Peichaer <rpe@cvs.openbsd.org>2014-02-02 19:33:24 +0000
commitd6bfb8facc4729f5f3a91f4753dc6197833c36a3 (patch)
treede4e9c328dc13d510f65ed9124e205da94796eae /distrib/miniroot
parentb3bd533513aab231fc4754d52e0350943bb59c6d (diff)
Allow to use ************* (13 '*') as password in the response file
for accounts which have password logins disabled but login with e.g. ssh-keys is still possible. suggested and OK sthen@, OK halex@
Diffstat (limited to 'distrib/miniroot')
-rw-r--r--distrib/miniroot/install.sub5
1 files changed, 3 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 29d01b9bcd2..4f3f0fd63fc 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.740 2014/02/02 17:37:24 rpe Exp $
+# $OpenBSD: install.sub,v 1.741 2014/02/02 19:33:23 rpe Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -363,7 +363,8 @@ encr_pwd() {
local _p=$1
if [[ -z $_p ]]; then
echo '*'
- elif [[ $_p == \$2?\$[0-9][0-9]\$* && ${#_p} > 40 ]]; then
+ elif [[ $_p == \$2?\$[0-9][0-9]\$* && ${#_p} > 40 ||
+ $_p == '*************' ]]; then
echo "$_p"
else
/mnt/usr/bin/encrypt -b 8 -- "$_p"