Merge remote branch 'upstream/master'

[srvx.git] / src / nickserv.h

diff --git a/src/nickserv.h b/src/nickserv.h
index 3311c9083d6c941365d6c948c7b6150730af751e..93579ff561b4fac4732d5fbb221e49df7f4b17f1 100644 (file)
--- a/src/nickserv.h
+++ b/src/nickserv.h
@@ -38,8 +38,11 @@ struct svccmd;
 #define HI_FLAG_NODELETE       0x00000080
 #define HI_FLAG_NETWORK_HELPER 0x00000100
 #define HI_FLAG_BOT            0x00000200
+#define HI_FLAG_AUTOHIDE       0x00000400
+#define HI_FLAG_INVI           0x00000800
+
 /* Flag characters for the above.  First char is LSB, etc. */
-#define HANDLE_FLAGS "SphgscfnHb"
+#define HANDLE_FLAGS "SphgscfnHbxI"
 
 /* HI_STYLE_* go into handle_info.userlist_style */
 #define HI_STYLE_DEF    'd'
@@ -59,6 +62,7 @@ struct svccmd;
 #define IsHelping(user) (user->handle_info && HANDLE_FLAGGED(user->handle_info, HELPING))
 #define IsStaff(user) (IsOper(user) || IsSupportHelper(user) || IsNetworkHelper(user))
 #define IsBot(user) (user->handle_info && HANDLE_FLAGGED(user->handle_info, BOT))
+#define IsInvi(user) (user->handle_info && HANDLE_FLAGGED(user->handle_info, INVI))
 
 enum cookie_type {
     ACTIVATION,
@@ -92,11 +96,14 @@ struct handle_info {
     struct handle_cookie *cookie;
     struct handle_note *notes;
     struct language *language;
+    char *website;
+    char *devnull;
     char *email_addr;
     char *epithet;
     char *infoline;
     char *handle;
     char *fakehost;
+    char *fakeident;
     unsigned long id;
     unsigned long registered;
     unsigned long lastseen;
@@ -135,6 +142,10 @@ struct modeNode *find_handle_in_channel(struct chanNode *channel, struct handle_
 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 *checklogin(const char *user, const char *pass, const char *numeric, const char *hostmask, const char *ipmask);
+char *getfakehost(const char *user);
+void nickserv_devnull_delete(char *name);
+void nickserv_devnull_rename(char *oldname, char *newname);
 
 /* auth_funcs are called when a user gets a new handle_info.  They are
  * called *after* user->handle_info has been updated.  */