fix some conflicts that for some reason weren't resolved during the last cherry-picks

[citadel.git] / citadel / auth.h

int validate_password(uid_t uid, const char *pass);