diff options
Diffstat (limited to 'dbus')
-rw-r--r-- | dbus/dbus-userdb-util.c | 10 | ||||
-rw-r--r-- | dbus/dbus-userdb.c | 32 | ||||
-rw-r--r-- | dbus/dbus-userdb.h | 3 |
3 files changed, 44 insertions, 1 deletions
diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c index bd9c2e35..344bd747 100644 --- a/dbus/dbus-userdb-util.c +++ b/dbus/dbus-userdb-util.c @@ -195,6 +195,16 @@ _dbus_user_database_lookup_group (DBusUserDatabase *db, _DBUS_ASSERT_ERROR_IS_CLEAR (error); + /* See if the group is really a number */ + if (gid == DBUS_UID_UNSET) + { + unsigned long n; + + if (_dbus_is_a_number (groupname, &n)) + gid = n; + } + + if (gid != DBUS_GID_UNSET) info = _dbus_hash_table_lookup_ulong (db->groups, gid); else diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c index f1317aa9..83a5769f 100644 --- a/dbus/dbus-userdb.c +++ b/dbus/dbus-userdb.c @@ -66,6 +66,27 @@ _dbus_group_info_free_allocated (DBusGroupInfo *info) } /** + * Checks if a given string is actually a number + * and converts it if it is + * + * @param str the string to check + * @param num the memory location of the unsigned long to fill in + * @returns TRUE if str is a number and num is filled in + */ +dbus_bool_t +_dbus_is_a_number (const DBusString *str, + unsigned long *num) +{ + int end; + + if (_dbus_string_parse_int (str, 0, num, &end) && + end == _dbus_string_get_length (str)) + return TRUE; + else + return FALSE; +} + +/** * Looks up a uid or username in the user database. Only one of name * or UID can be provided. There are wrapper functions for this that * are better to use, this one does no locking or anything on the @@ -87,7 +108,16 @@ _dbus_user_database_lookup (DBusUserDatabase *db, _DBUS_ASSERT_ERROR_IS_CLEAR (error); _dbus_assert (uid != DBUS_UID_UNSET || username != NULL); - + + /* See if the username is really a number */ + if (uid == DBUS_UID_UNSET) + { + unsigned long n; + + if (_dbus_is_a_number (username, &n)) + uid = n; + } + if (uid != DBUS_UID_UNSET) info = _dbus_hash_table_lookup_ulong (db->users, uid); else diff --git a/dbus/dbus-userdb.h b/dbus/dbus-userdb.h index 316b99b7..7e033b41 100644 --- a/dbus/dbus-userdb.h +++ b/dbus/dbus-userdb.h @@ -106,6 +106,9 @@ dbus_bool_t _dbus_credentials_from_uid (dbus_uid_t user_id, dbus_bool_t _dbus_is_console_user (dbus_uid_t uid, DBusError *error); +dbus_bool_t _dbus_is_a_number (const DBusString *str, + unsigned long *num); + DBUS_END_DECLS |