extern UserMessageHandler umhandlers[MAXLOCALUSER+1];
-#define registerlocaluserwithuserid(nickname, ident, host, realname, authname, id, umodes, handler) registerlocaluserwithuseridflags(nickname, ident, host, realname, authname, id, umodes, 0, handler)
-#define registerlocaluser(nickname, ident, host, realname, authname, umodes, handler) registerlocaluserwithuserid(nickname, ident, host, realname, authname, 0, umodes, handler)
-nick *registerlocaluserwithuseridflags(char *nickname, char *ident, char *host, char *realname, char *authname, unsigned long authid, flag_t umodes, flag_t accountflags, UserMessageHandler hander);
+#define registerlocaluserflags(nickname, ident, host, realname, authname, authid, accountflags, umodes, handler) registerlocaluserflagsip(nickname, ident, host, realname, authname, authid, accountflags, umodes, NULL, handler)
+#define registerlocaluser(nickname, ident, host, realname, authname, umodes, handler) registerlocaluserflags(nickname, ident, host, realname, authname, 0, 0, umodes, handler)
+nick *registerlocaluserflagsip(char *nickname, char *ident, char *host, char *realname, char *authname, unsigned long authid, flag_t accountflags, flag_t umodes, struct irc_in_addr *ipaddress, UserMessageHandler hander);
int renamelocaluser(nick *np, char *newnick);
int deregisterlocaluser(nick *np, char *reason);
UserMessageHandler hooklocaluserhandler(nick *np, UserMessageHandler newhandler);
int handleprivatemsgcmd(void *source, int cargc, char **cargv);
int handleprivatenoticecmd(void *source, int cargc, char **cargv);
int handlemessageornotice(void *source, int cargc, char **cargv, int isnotice);
-void sendmessagetouser(nick *source, nick *target, char *format, ... );
-void sendsecuremessagetouser(nick *source, nick *target, char *servername, char *format, ... );
-void sendnoticetouser(nick *source, nick *target, char *format, ... );
-void killuser(nick *source, nick *target, char *format, ... );
-#define localusersetaccount(np, accname) localusersetaccountwithuserid(np, accname, 0)
-#define localusersetaccountwithuserid(np, accname, userid) localusersetaccountwithuseridflags(np, accname, userid, 0)
-#define localusersetaccountwithuseridflags(np, accname, accid, accountflags) localusersetaccountwithuseridflagsts(np, accname, accid, accountflags, 0)
-#define localusersetaccountwithuseridts(np, accname, userid, authts) localusersetaccountwithuseridflagsts(np, accname, userid, 0, authts)
-void localusersetaccountwithuseridflagsts(nick *np, char *accname, unsigned long accid, flag_t accountflags, time_t authTS);
+void sendmessagetouser(nick *source, nick *target, char *format, ... ) __attribute__ ((format (printf, 3, 4)));
+void sendsecuremessagetouser(nick *source, nick *target, char *servername, char *format, ... ) __attribute__ ((format (printf, 4, 5)));
+void sendnoticetouser(nick *source, nick *target, char *format, ... ) __attribute__ ((format (printf, 3, 4)));
+void killuser(nick *source, nick *target, char *format, ... ) __attribute__ ((format (printf, 3, 4)));
+void localusersetaccount(nick *np, char *accname, unsigned long accid, u_int64_t accountflags, time_t authTS);
void localusersetumodes(nick *np, flag_t newmodes);
void sethostuser(nick *target, char *ident, char *host);
+void localusersetaccountflags(authname *anp, u_int64_t accountflags);
+void localuseraddcloaktarget(nick *np, nick *target);
+void localuserclearcloaktargets(nick *np);
#endif