diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2017-11-23 12:05:35 +1100 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2017-11-23 12:05:35 +1100 |
| commit | 82f5248254af24e94dd0955297cd5259ca45b1b8 (patch) | |
| tree | 9296417df06d845ad740f45b6ba9f1634a8bd656 /cmd/modutil | |
| parent | 7bdd85eefb8ae0a63bf8228886b9c2b13a857dd1 (diff) | |
| parent | 6280b248e57fa54bcd197edd6491962c9fc0e772 (diff) | |
| download | nss-hg-82f5248254af24e94dd0955297cd5259ca45b1b8.tar.gz | |
Merge NSS trunk to NSS_TLS13_DRAFT19_BRANCH
Diffstat (limited to 'cmd/modutil')
| -rw-r--r-- | cmd/modutil/pk11.c | 2 |
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) { |