summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2007-06-14 18:34:28 +0000
committerRalf Habacker <ralf.habacker@freenet.de>2007-06-14 18:34:28 +0000
commitcf4c8dbfa84136c44a18b65168ca599baec45d3a (patch)
tree62f413736250c26aa9d5cfff98e941ac6ec0f99d
parenteacd8a9ed70050544010064aad33f55c777d7d66 (diff)
* dbus/dbus-sysdeps.c: moved global lock system_users from dbus-userdb.c
-rw-r--r--ChangeLog4
-rw-r--r--dbus/dbus-sysdeps.c1
-rw-r--r--dbus/dbus-userdb.c1
3 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f5c73cf..b22d6204 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-06-14 Ralf Habacker <ralf.habacker@freenet.de>
+ * dbus/dbus-sysdeps.c: moved global lock system_users from dbus-userdb.c
+
+2007-06-14 Ralf Habacker <ralf.habacker@freenet.de>
+
* global rename of function dbus_username_from_current_process
to _dbus_append_desired_identity.
Approved by Havoc Pennington
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index cf689bc0..7f779600 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -49,6 +49,7 @@
_DBUS_DEFINE_GLOBAL_LOCK (win_fds);
_DBUS_DEFINE_GLOBAL_LOCK (sid_atom_cache);
+_DBUS_DEFINE_GLOBAL_LOCK (system_users);
/**
* @defgroup DBusSysdeps Internal system-dependent API
diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index 5a5d9098..6ef20553 100644
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -218,7 +218,6 @@ _dbus_user_database_lookup (DBusUserDatabase *db,
}
}
-_DBUS_DEFINE_GLOBAL_LOCK(system_users);
static dbus_bool_t database_locked = FALSE;
static DBusUserDatabase *system_db = NULL;
static DBusString process_username;