summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaiki Ueno <dueno@redhat.com>2017-11-09 17:25:57 +0100
committerDaiki Ueno <dueno@redhat.com>2017-11-09 17:25:57 +0100
commit513e8ba21ec9e46def0177f868eedfc1d136c4f3 (patch)
treedbac029dfadf36c1f0d8422e408c7c5fcc83d12d
parent1a19abcf8293acde3518e2a6619ae292392e425c (diff)
downloadnss-hg-513e8ba21ec9e46def0177f868eedfc1d136c4f3.tar.gz
Bug 1415847, modutil: Suppress unnecessary password prompt, r=kaie
-rw-r--r--cmd/modutil/pk11.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/modutil/pk11.c b/cmd/modutil/pk11.c
index 93783a339..1efc1895c 100644
--- a/cmd/modutil/pk11.c
+++ b/cmd/modutil/pk11.c
@@ -728,7 +728,7 @@ ChangePW(char *tokenName, char *pwFile, char *newpwFile)
ret = BAD_PW_ERR;
goto loser;
}
- } else {
+ } else if (PK11_NeedLogin(slot)) {
for (matching = PR_FALSE; !matching;) {
oldpw = SECU_GetPasswordString(NULL, "Enter old password: ");
if (PK11_CheckUserPassword(slot, oldpw) == SECSuccess) {