diff options
author | Not Zed <NotZed@Ximian.com> | 2004-05-13 16:43:02 +0800 |
---|---|---|
committer | Michael Zucci <zucchi@src.gnome.org> | 2004-05-13 16:43:02 +0800 |
commit | e7c808ae155ad50c9fd7c876c744054ab2be2a15 (patch) | |
tree | 5bef0ecd0fe916e9189304a7e54d410e7f2085de | |
parent | cf9a0987d91a362480ba13fc6f901c27c8e40a08 (diff) | |
download | gsoc2013-evolution-e7c808ae155ad50c9fd7c876c744054ab2be2a15.tar.gz gsoc2013-evolution-e7c808ae155ad50c9fd7c876c744054ab2be2a15.tar.zst gsoc2013-evolution-e7c808ae155ad50c9fd7c876c744054ab2be2a15.zip |
call SetPasswordFunc before calling authenticate - some nss calls can
2004-05-13 Not Zed <NotZed@Ximian.com>
* lib/e-cert-db.c (e_cert_db_login_to_slot): call SetPasswordFunc
before calling authenticate - some nss calls can overwrite the
setting. #52820.
svn path=/trunk/; revision=25895
-rw-r--r-- | smime/ChangeLog | 6 | ||||
-rw-r--r-- | smime/lib/e-cert-db.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog index 09c0d9c029..f3749f528b 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,9 @@ +2004-05-13 Not Zed <NotZed@Ximian.com> + + * lib/e-cert-db.c (e_cert_db_login_to_slot): call SetPasswordFunc + before calling authenticate - some nss calls can overwrite the + setting. #52820. + 2004-04-30 Chris Toshok <toshok@ximian.com> [ fixes bug #52724 ] diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index 7831572097..6141501f45 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -1157,6 +1157,7 @@ e_cert_db_login_to_slot (ECertDB *cert_db, PK11_InitPin (slot, "", pwd); } + PK11_SetPasswordFunc(pk11_password); if (PK11_Authenticate (slot, PR_TRUE, NULL) != SECSuccess) { printf ("PK11_Authenticate failed (err = %d/%d)\n", PORT_GetError(), PORT_GetError() + 0x2000); return FALSE; |