[src/trunk]: src/sbin/cgdconfig Missed one change when doing a manual merge o...

[alnsn <alnsn%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/50c33327ca4f
branches:  trunk
changeset: 322624:50c33327ca4f
user:      alnsn <alnsn%NetBSD.org@localhost>
date:      Wed May 09 18:18:11 2018 +0000

description:
Missed one change when doing a manual merge of my patch with kre's commit.

diffstat:

 sbin/cgdconfig/cgdconfig.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 0525076587fc -r 50c33327ca4f sbin/cgdconfig/cgdconfig.c
--- a/sbin/cgdconfig/cgdconfig.c        Wed May 09 18:11:56 2018 +0000
+++ b/sbin/cgdconfig/cgdconfig.c        Wed May 09 18:18:11 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdconfig.c,v 1.46 2018/05/09 18:11:56 alnsn Exp $ */
+/* $NetBSD: cgdconfig.c,v 1.47 2018/05/09 18:18:11 alnsn Exp $ */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 2002, 2003\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: cgdconfig.c,v 1.46 2018/05/09 18:11:56 alnsn Exp $");
+__RCSID("$NetBSD: cgdconfig.c,v 1.47 2018/05/09 18:18:11 alnsn Exp $");
 #endif
 
 #include <err.h>
@@ -599,7 +599,9 @@
         * a password.
         */
 
-       for (kg = p->keygen; pflag == PFLAG_GETPASS && kg; kg = kg->next)
+       for (kg = p->keygen;
+           (pflag & PFLAG_GETPASS_MASK) && kg;
+           kg = kg->next)
                if ((kg->kg_method == KEYGEN_PKCS5_PBKDF2_SHA1) ||
                    (kg->kg_method == KEYGEN_PKCS5_PBKDF2_OLD )) {
                        loop = 1;