summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-keyring.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-04-17 23:17:04 +0000
committerHavoc Pennington <hp@redhat.com>2003-04-17 23:17:04 +0000
commit88cd5da3c0ec86fed29942b062c2f7bf0f8fda44 (patch)
tree9ca9236af208046ed5d6edae99cf62d13237f1d0 /dbus/dbus-keyring.c
parent4219b08bfa318443419c7a3acde28f0b237b05fe (diff)
2003-04-17 Havoc Pennington <hp@redhat.com>
* dbus/dbus-userdb.c, dbus/dbus-sysdeps.c: redo all the passwd database usage so it all goes via the DBusUserDatabase cache.
Diffstat (limited to 'dbus/dbus-keyring.c')
-rw-r--r--dbus/dbus-keyring.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
index b9203404..85f0a015 100644
--- a/dbus/dbus-keyring.c
+++ b/dbus/dbus-keyring.c
@@ -22,6 +22,7 @@
*/
#include "dbus-keyring.h"
+#include "dbus-userdb.h"
#include <dbus/dbus-string.h>
#include <dbus/dbus-list.h>
#include <dbus/dbus-sysdeps.h>
@@ -699,10 +700,9 @@ _dbus_keyring_new_homedir (const DBusString *username,
if (username == NULL)
{
const DBusString *const_homedir;
-
- if (!_dbus_user_info_from_current_process (&username,
- &const_homedir,
- NULL))
+
+ if (!_dbus_username_from_current_process (&username) ||
+ !_dbus_homedir_from_current_process (&const_homedir))
goto failed;
if (!_dbus_string_copy (const_homedir, 0,