diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | bus/bus.c | 3 | ||||
| -rw-r--r-- | bus/dbus-daemon.1.in | 7 | ||||
| -rw-r--r-- | dbus/dbus-hash.c | 16 | ||||
| -rw-r--r-- | dbus/dbus-hash.h | 1 | ||||
| -rw-r--r-- | dbus/dbus-userdb.c | 12 | ||||
| -rw-r--r-- | dbus/dbus-userdb.h | 1 |
7 files changed, 49 insertions, 3 deletions
@@ -1,3 +1,15 @@ +2006-03-06 Sjoerd Simons <sjoerd@luon.net> + + * bus/bus.c: (bus_context_reload_config): Flush the user database cache on + config reload. + * bus/dbus-daemon.1.in: Also note that SIGHUP flushes the user/group + information caches + * dbus/dbus-hash.c: (_dbus_hash_table_remove_all): + * dbus/dbus-hash.h: Add function to remove all entries from a hash table + * dbus/dbus-userdb.c: (_dbus_user_database_flush): + * dbus/dbus-userdb.h: Add function to flush all user/group information + caches. + 2006-03-06 Thiago Macieira <thiago.macieira@trolltech.com> * qt/dbusidl2cpp.cpp: @@ -790,6 +790,9 @@ bus_context_reload_config (BusContext *context, DBusString config_file; dbus_bool_t ret; + /* Flush the user database cache */ + _dbus_user_database_flush(context->user_database); + ret = FALSE; _dbus_string_init_const (&config_file, context->config_file); parser = bus_config_load (&config_file, TRUE, NULL, error); diff --git a/bus/dbus-daemon.1.in b/bus/dbus-daemon.1.in index 5144bc18..be2fac0a 100644 --- a/bus/dbus-daemon.1.in +++ b/bus/dbus-daemon.1.in @@ -51,9 +51,10 @@ in any way). .PP SIGHUP will cause the D-BUS daemon to PARTIALLY reload its -configuration file. Some configuration changes would require kicking -all apps off the bus; so they will only take effect if you restart the -daemon. Policy changes should take effect with SIGHUP. +configuration file and to flush its user/group information caches. Some +configuration changes would require kicking all apps off the bus; so they will +only take effect if you restart the daemon. Policy changes should take effect +with SIGHUP. .SH OPTIONS The following options are supported: diff --git a/dbus/dbus-hash.c b/dbus/dbus-hash.c index fa2104b3..8eca2bd8 100644 --- a/dbus/dbus-hash.c +++ b/dbus/dbus-hash.c @@ -422,6 +422,22 @@ _dbus_hash_table_unref (DBusHashTable *table) } } +/** + * Removed all entries from a hash table. + * + * @param table the hash table to remove all entries from. + */ +void +_dbus_hash_table_remove_all (DBusHashTable *table) +{ + DBusHashIter iter; + _dbus_hash_iter_init (table, &iter); + while (_dbus_hash_iter_next (&iter)) + { + _dbus_hash_iter_remove_entry(&iter); + } +} + static DBusHashEntry* alloc_entry (DBusHashTable *table) { diff --git a/dbus/dbus-hash.h b/dbus/dbus-hash.h index 7db06f0c..3eb82d04 100644 --- a/dbus/dbus-hash.h +++ b/dbus/dbus-hash.h @@ -63,6 +63,7 @@ DBusHashTable* _dbus_hash_table_new (DBusHashType type, DBusFreeFunction value_free_function); DBusHashTable* _dbus_hash_table_ref (DBusHashTable *table); void _dbus_hash_table_unref (DBusHashTable *table); +void _dbus_hash_table_remove_all (DBusHashTable *table); void _dbus_hash_iter_init (DBusHashTable *table, DBusHashIter *iter); dbus_bool_t _dbus_hash_iter_next (DBusHashIter *iter); diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c index 9efc4653..17ce47d3 100644 --- a/dbus/dbus-userdb.c +++ b/dbus/dbus-userdb.c @@ -476,6 +476,18 @@ _dbus_user_database_new (void) return NULL; } +/** + * Flush all information out of the user database. + */ +void +_dbus_user_database_flush (DBusUserDatabase *db) +{ + _dbus_hash_table_remove_all(db->users_by_name); + _dbus_hash_table_remove_all(db->groups_by_name); + _dbus_hash_table_remove_all(db->users); + _dbus_hash_table_remove_all(db->groups); +} + #ifdef DBUS_BUILD_TESTS /** * Increments refcount of user database. diff --git a/dbus/dbus-userdb.h b/dbus/dbus-userdb.h index 7e033b41..906c6ab3 100644 --- a/dbus/dbus-userdb.h +++ b/dbus/dbus-userdb.h @@ -51,6 +51,7 @@ struct DBusUserDatabase DBusUserDatabase* _dbus_user_database_new (void); DBusUserDatabase* _dbus_user_database_ref (DBusUserDatabase *db); +void _dbus_user_database_flush (DBusUserDatabase *db); void _dbus_user_database_unref (DBusUserDatabase *db); dbus_bool_t _dbus_user_database_get_groups (DBusUserDatabase *db, dbus_uid_t uid, |