Blame SOURCES/nss-modutil-suppress-password.patch

74fc46
# HG changeset patch
74fc46
# User Daiki Ueno <dueno@redhat.com>
74fc46
# Date 1510244757 -3600
74fc46
#      Thu Nov 09 17:25:57 2017 +0100
74fc46
# Node ID 523734e69b5cdd7c2c9047e705e858da352a3b24
74fc46
# Parent  54be8a4501d454b2b7454e4a44ea013738e0b693
74fc46
Bug 1415847, modutil: Suppress unnecessary password prompt, r=kaie
74fc46
74fc46
diff --git a/cmd/modutil/pk11.c b/cmd/modutil/pk11.c
74fc46
--- a/cmd/modutil/pk11.c
74fc46
+++ b/cmd/modutil/pk11.c
74fc46
@@ -728,7 +728,7 @@ ChangePW(char *tokenName, char *pwFile, 
74fc46
                 ret = BAD_PW_ERR;
74fc46
                 goto loser;
74fc46
             }
74fc46
-        } else {
74fc46
+        } else if (PK11_NeedLogin(slot)) {
74fc46
             for (matching = PR_FALSE; !matching;) {
74fc46
                 oldpw = SECU_GetPasswordString(NULL, "Enter old password: ");
74fc46
                 if (PK11_CheckUserPassword(slot, oldpw) == SECSuccess) {