# HG changeset patch
# User Daiki Ueno <dueno@redhat.com>
# Date 1513770602 -3600
#      Wed Dec 20 12:50:02 2017 +0100
# Node ID 29b2a346746fb03316cf97c8c7b0837b714c255b
# Parent  5a14f42384eb22b67e0465949c03555eff41e4af
Bug 1426361, certutil: check CKF_LOGIN_REQUIRED as well as CKF_USER_PIN_INITIALIZED, r=rrelyea

diff --git a/cmd/certutil/certutil.c b/cmd/certutil/certutil.c
--- a/cmd/certutil/certutil.c
+++ b/cmd/certutil/certutil.c
@@ -3171,7 +3171,7 @@ certutil_main(int argc, char **argv, PRB
         certutil.commands[cmd_CreateAndAddCert].activated ||
         certutil.commands[cmd_AddCert].activated ||
         certutil.commands[cmd_AddEmailCert].activated) {
-        if (PK11_NeedUserInit(slot)) {
+        if (PK11_NeedLogin(slot) && PK11_NeedUserInit(slot)) {
             char *password = NULL;
             /* fetch the password from the command line or the file
              * if no password is supplied, initialize the password to NULL */