X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/0f6fe38cf6a842e638aa35ac7641e1e792634e2c..8536ac6b661fa261bad7de981045401f514fb6b7:/src/nickserv.h diff --git a/src/nickserv.h b/src/nickserv.h index e59839a..490382a 100644 --- a/src/nickserv.h +++ b/src/nickserv.h @@ -22,6 +22,7 @@ #define _nickserv_h #include "hash.h" /* for NICKLEN, etc., and common.h */ +#include "dict.h" #include /* for regex in nickserv_config */ struct svccmd; @@ -91,6 +92,7 @@ struct handle_note { struct handle_info { struct nick_info *nicks; struct string_list *masks; + struct string_list *sslfps; struct string_list *ignores; struct userNode *users; struct userData *channels; @@ -104,6 +106,7 @@ struct handle_info { char *fakehost; time_t registered; time_t lastseen; + int karma; unsigned short flags; unsigned short opserv_level; unsigned short screen_width; @@ -178,8 +181,12 @@ struct nickserv_config { unsigned long auto_reclaim_delay; unsigned char default_maxlogins; unsigned char hard_maxlogins; + unsigned long ounregister_inactive; + unsigned long ounregister_flags; const char *auto_oper; const char *auto_admin; + const char *auto_oper_privs; + const char *auto_admin_privs; char default_style; struct string_list *denied_fakehost_words; unsigned int force_handles_lowercase; @@ -196,8 +203,10 @@ struct nickserv_config { const char *ldap_field_account; const char *ldap_field_password; const char *ldap_field_email; + const char *ldap_field_oslevel; struct string_list *ldap_object_classes; const char *ldap_oper_group_dn; + unsigned int ldap_oper_group_level; const char *ldap_field_group_member; unsigned int ldap_timeout; #endif @@ -207,49 +216,51 @@ void init_nickserv(const char *nick); struct handle_info *get_handle_info(const char *handle); struct handle_info *smart_get_handle_info(struct userNode *service, struct userNode *user, const char *name); int oper_try_set_access(struct userNode *user, struct userNode *bot, struct handle_info *target, unsigned int new_level); -int oper_outranks(struct svccmd *cmd, struct userNode *user, struct handle_info *hi); +int oper_outranks(struct userNode *user, struct handle_info *hi); struct nick_info *get_nick_info(const char *nick); struct modeNode *find_handle_in_channel(struct chanNode *channel, struct handle_info *handle, struct userNode *except); int nickserv_modify_handle_flags(struct userNode *user, struct userNode *bot, const char *str, unsigned long *add, unsigned long *remove); int oper_has_access(struct userNode *user, struct userNode *bot, unsigned int min_level, unsigned int quiet); void nickserv_show_oper_accounts(struct userNode *user, struct svccmd *cmd); -struct handle_info *get_victim_oper(struct svccmd *cmd, struct userNode *user, const char *target); -struct handle_info *loc_auth(char *handle, char *password); +struct handle_info *get_victim_oper(struct userNode *user, const char *target); +struct handle_info *loc_auth(char *sslfp, char *handle, char *password, char *userhost); -typedef void (*user_mode_func_t)(struct userNode *user, const char *mode_change); -void reg_user_mode_func(user_mode_func_t func); -typedef void (*channel_mode_func_t)(struct userNode *who, struct chanNode *channel, char **mode, unsigned int argc); -void reg_channel_mode_func(channel_mode_func_t func); +typedef void (*user_mode_func_t)(struct userNode *user, const char *mode_change, void *extra); +void reg_user_mode_func(user_mode_func_t func, void *extra); +typedef void (*channel_mode_func_t)(struct userNode *who, struct chanNode *channel, char **mode, unsigned int argc, void *extra); +void reg_channel_mode_func(channel_mode_func_t func, void *extra); /* auth_funcs are called when a user gets a new handle_info. They are * called *after* user->handle_info has been updated. */ -typedef void (*auth_func_t)(struct userNode *user, struct handle_info *old_handle); -void reg_auth_func(auth_func_t func); +typedef void (*auth_func_t)(struct userNode *user, struct handle_info *old_handle, void *extra); +void reg_auth_func(auth_func_t func, void *extra); /* Called just after a handle is renamed. */ -typedef void (*handle_rename_func_t)(struct handle_info *handle, const char *old_handle); -void reg_handle_rename_func(handle_rename_func_t func); +typedef void (*handle_rename_func_t)(struct handle_info *handle, const char *old_handle, void *extra); +void reg_handle_rename_func(handle_rename_func_t func, void *extra); /* unreg_funcs are called right before a handle is unregistered. * `user' is the person who caused the handle to be unregistered (either a * client authed to the handle, or an oper). */ -typedef void (*unreg_func_t)(struct userNode *user, struct handle_info *handle); -void reg_unreg_func(unreg_func_t func); +typedef void (*unreg_func_t)(struct userNode *user, struct handle_info *handle, void *extra); +void reg_unreg_func(unreg_func_t func, void *extra); /* Called just before a handle is merged */ -typedef void (*handle_merge_func_t)(struct userNode *user, struct handle_info *handle_to, struct handle_info *handle_from); -void reg_handle_merge_func(handle_merge_func_t); +typedef void (*handle_merge_func_t)(struct userNode *user, struct handle_info *handle_to, struct handle_info *handle_from, void *extra); +void reg_handle_merge_func(handle_merge_func_t, void *extra); /* Called after an allowauth. handle is null if allowauth authorization was * removed */ -typedef void (*allowauth_func_t)(struct userNode *user, struct userNode *target, struct handle_info *handle); -void reg_allowauth_func(allowauth_func_t func); +typedef void (*allowauth_func_t)(struct userNode *user, struct userNode *target, struct handle_info *handle, void *extra); +void reg_allowauth_func(allowauth_func_t func, void *extra); /* Called when an auth attempt fails because of a bad password */ -typedef void (*failpw_func_t)(struct userNode *user, struct handle_info *handle); -void reg_failpw_func(failpw_func_t func); +typedef void (*failpw_func_t)(struct userNode *user, struct handle_info *handle, void *extra); +void reg_failpw_func(failpw_func_t func, void *extra); void send_func_list(struct userNode *user); +extern dict_t nickserv_handle_dict; + #endif