--- a/src/server/daemon/keyfile_auth.h Wed Nov 02 19:19:01 2022 +0100 +++ b/src/server/daemon/keyfile_auth.h Sun Nov 06 15:53:32 2022 +0100 @@ -31,7 +31,7 @@ #include "../public/auth.h" -#include <ucx/map.h> +#include <cx/map.h> #include <inttypes.h> #ifdef __cplusplus @@ -49,35 +49,35 @@ struct keyfile { AuthDB authdb; - UcxMap *users; + CxMap *users; }; struct keyfile_user { User user; - sstr_t *groups; + cxmutstr *groups; size_t numgroups; enum KeyfileHashType hash_type; char *hash; size_t hashlen; }; -Keyfile* keyfile_new(UcxAllocator *a); +Keyfile* keyfile_new(CxAllocator *a); int keyfile_add_user( Keyfile *keyfile, - sstr_t user, + cxmutstr user, enum KeyfileHashType hash_type, - sstr_t hash, - sstr_t *groups, + cxmutstr hash, + cxmutstr *groups, size_t ngroups); -User* keyfile_get_user(AuthDB *db, char *user); -int keyfile_user_verify_password(User *user, char *password); -int keyfile_user_check_group(User *user, char *group); +User* keyfile_get_user(AuthDB *db, const char *user); +int keyfile_user_verify_password(User *user, const char *password); +int keyfile_user_check_group(User *user, const char *group); void keyfile_user_free(User *user); // SSHA password compare -int ssha_verify(KeyfileUser *user, char *password); +int ssha_verify(KeyfileUser *user, const char *password); #ifdef __cplusplus }