Return an error if an extended ban is invalid

[irc/evilnet/x3.git] / src / nickserv.h

diff --git a/src/nickserv.h b/src/nickserv.h
index bd83a64625e47129f9289f5480c894e1334a581e..1268f07f46a44a9b2fd94d0528023098d77eb3ca 100644 (file)
--- a/src/nickserv.h
+++ b/src/nickserv.h
@@ -83,12 +83,9 @@ struct handle_cookie {
 };
 
 struct handle_note {
-    struct handle_note *next;
-    time_t expires;
-    time_t set;
-    int id;
-    char setter[NICKSERV_HANDLE_LEN+1];
-    char note[1];
+    char            setter[NICKSERV_HANDLE_LEN+1];
+    time_t          date;
+    char            note[1];
 };
 
 struct handle_info {
@@ -98,7 +95,6 @@ struct handle_info {
     struct userNode *users;
     struct userData *channels;
     struct handle_cookie *cookie;
-    struct handle_note *notes;
     struct handle_note *note;
     struct language *language;
     char *email_addr;
@@ -114,6 +110,7 @@ struct handle_info {
     unsigned short screen_width;
     unsigned short table_width;
     unsigned char userlist_style;
+    unsigned char announcements;
     unsigned char maxlogins;
     char passwd[MD5_CRYPT_LENGTH+1];
     char last_quit_host[USERLEN+HOSTLEN+2];
@@ -204,6 +201,7 @@ struct nickserv_config {
     const char *ldap_field_email;
     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
@@ -213,15 +211,15 @@ 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 *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);