callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear the password in bonobo-conf as well. Fixes ximian 14893.

Browse Source 
* e-passwords.c (e_passwords_forget_password): Clear the password
        in bonobo-conf as well. Fixes ximian 14893.

svn path=/trunk/; revision=14754
This commit is contained in:
Dan Winship
2001-11-20 05:37:27 +00:00
parent b9a1423474
commit 3bbe7554d7
2 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e-util/ChangeLog
View File

@ -1,3 +1,8 @@
2001-11-20 Dan Winship <danw@ximian.com>
* e-passwords.c (e_passwords_forget_password): Clear the password
in bonobo-conf as well. Fixes ximian 14893.
2001-11-13 Ettore Perazzoli <ettore@ximian.com> 2001-11-13 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am (libeutil_la_LIBADD): Remove `-lc'. It makes the * Makefile.am (libeutil_la_LIBADD): Remove `-lc'. It makes the

47
e-util/e-passwords.c
View File

@ -158,6 +158,22 @@ e_passwords_clear_component_passwords ()
g_free (path); g_free (path);
} }
static char *
password_path (const char *key)
{
int len, state, save;
char *key64, *path;
len = strlen (key);
key64 = g_malloc0 ((len + 2) * 4 / 3 + 1);
state = save = 0;
base64_encode_close ((char*)key, len, FALSE, key64, &state, &save);
path = g_strdup_printf ("/Passwords/%s/%s", component_name, key64);
g_free (key64);
return path;
}
/** /**
* e_passwords_remember_password: * e_passwords_remember_password:
* @key: the key * @key: the key
@ -168,19 +184,14 @@ void
e_passwords_remember_password (const char *key) e_passwords_remember_password (const char *key)
{ {
gpointer okey, value; gpointer okey, value;
char *path, *key64, *pass64; char *path, *pass64;
int len, state, save; int len, state, save;
if (!g_hash_table_lookup_extended (passwords, key, &okey, &value)) if (!g_hash_table_lookup_extended (passwords, key, &okey, &value))
return; return;
/* add it to the on-disk cache of passwords */ /* add it to the on-disk cache of passwords */
len = strlen (okey); path = password_path (okey);
key64 = g_malloc0 ((len + 2) * 4 / 3 + 1);
state = save = 0;
base64_encode_close (okey, len, FALSE, key64, &state, &save);
path = g_strdup_printf ("/Passwords/%s/%s", component_name, key64);
g_free (key64);
len = strlen (value); len = strlen (value);
pass64 = g_malloc0 ((len + 2) * 4 / 3 + 1); pass64 = g_malloc0 ((len + 2) * 4 / 3 + 1);
@ -201,13 +212,14 @@ e_passwords_remember_password (const char *key)
* e_passwords_forget_password: * e_passwords_forget_password:
* @key: the key * @key: the key
* *
* Forgets the password associated with @key for the rest of the session, * Forgets the password associated with @key, in memory and on disk.
* but does not affect the on-disk cache.
**/ **/
void void
e_passwords_forget_password (const char *key) e_passwords_forget_password (const char *key)
{ {
gpointer okey, value; gpointer okey, value;
CORBA_Environment ev;
char *path;
if (g_hash_table_lookup_extended (passwords, key, &okey, &value)) { if (g_hash_table_lookup_extended (passwords, key, &okey, &value)) {
g_hash_table_remove (passwords, key); g_hash_table_remove (passwords, key);
@ -215,6 +227,13 @@ e_passwords_forget_password (const char *key)
g_free (okey); g_free (okey);
g_free (value); g_free (value);
} }
/* clear it in the on disk db */
path = password_path (key);
CORBA_exception_init (&ev);
Bonobo_ConfigDatabase_removeValue (db, path, &ev);
CORBA_exception_free (&ev);
g_free (path);
} }
/** /**
@ -228,20 +247,14 @@ char *
e_passwords_get_password (const char *key) e_passwords_get_password (const char *key)
{ {
char *passwd = g_hash_table_lookup (passwords, key); char *passwd = g_hash_table_lookup (passwords, key);
char *path, *key64; char *path;
int len, state, save;
CORBA_Environment ev; CORBA_Environment ev;
if (passwd) if (passwd)
return g_strdup (passwd); return g_strdup (passwd);
/* not part of the session hash, look it up in the on disk db */ /* not part of the session hash, look it up in the on disk db */
len = strlen (key); path = password_path (key);
key64 = g_malloc0 ((len + 2) * 4 / 3 + 1);
state = save = 0;
base64_encode_close ((char*)key, len, FALSE, key64, &state, &save);
path = g_strdup_printf ("/Passwords/%s/%s", component_name, key64);
g_free (key64);
/* We need to pass an ev to bonobo-conf, or it will emit a /* We need to pass an ev to bonobo-conf, or it will emit a
* g_warning if the data isn't found. * g_warning if the data isn't found.