aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--smime/ChangeLog9
-rw-r--r--smime/gui/component.c4
-rw-r--r--smime/lib/e-pkcs12.c2
3 files changed, 12 insertions, 3 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog
index ebb0e67a6a..d02f320b5c 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-27 Veerapuram Varadhan <vvaradhan@novell.com>
+
+ ** Fixes #334848
+
+ * lib/e-pkcs12.c (prompt_for_password):
+ * gui/component.c (smime_pk11_passwd), (smime_pk11_change_passwd):
+ Do not pass NULL for the domain parameter of
+ e_passwords_ask_password.
+
2006-06-15 Tor Lillqvist <tml@novell.com>
* lib/e-cert-db.c (initialize_nss): On Win32, NSS wants filenames
diff --git a/smime/gui/component.c b/smime/gui/component.c
index a603529459..6e424b3c67 100644
--- a/smime/gui/component.c
+++ b/smime/gui/component.c
@@ -47,7 +47,7 @@ smime_pk11_passwd (ECertDB *db, PK11SlotInfo* slot, gboolean retry, char **passw
prompt = g_strdup_printf (_("Enter the password for `%s'"), slot_name);
g_free (slot_name);
- *passwd = e_passwords_ask_password (_("Enter password"), NULL, NULL,
+ *passwd = e_passwords_ask_password (_("Enter password"), "SMIME-PKCS11", NULL,
prompt,
E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
NULL);
@@ -69,7 +69,7 @@ smime_pk11_change_passwd (ECertDB *db, char **old_passwd, char **passwd, gpointe
/* we're setting the password initially */
prompt = _("Enter new password for certificate database");
- *passwd = e_passwords_ask_password (_("Enter new password"), NULL, NULL,
+ *passwd = e_passwords_ask_password (_("Enter new password"), "SMIME-PKCS11", NULL,
prompt,
E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
NULL);
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index 55a5fe0cb4..6830b69df3 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -219,7 +219,7 @@ prompt_for_password (char *title, char *prompt, SECItem *pwd)
{
char *passwd;
- passwd = e_passwords_ask_password (title, NULL, NULL, prompt,
+ passwd = e_passwords_ask_password (title, "SMIME-PKCS12", NULL, prompt,
E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
NULL);