X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=include%2Fs_user.h;h=63ed134d2c52bf193e39799344a673533a2a29f3;hb=refs%2Fheads%2Fupstream-ssl;hp=80cae35ed7a3ec81f9f326e935ad756d822ebdb1;hpb=5246a6127cca4385da318f2e75271b4f5907947b;p=ircu2.10.12-pk.git

diff --git a/include/s_user.h b/include/s_user.h
index 80cae35..63ed134 100644
--- a/include/s_user.h
+++ b/include/s_user.h
@@ -50,7 +50,9 @@ struct Flags;
 #define MATCH_SERVER  1 /**< flag for relay_masked_message (etc) to indicate the mask matches a server name */
 #define MATCH_HOST    2 /**< flag for relay_masked_message (etc) to indicate the mask matches host name */
 
-#define COOKIE_VERIFIED 0xffffffff /**< value for cli_cookie() to show completion */
+/* used for parsing user modes */
+#define ALLOWMODES_ANY	0 /**< Allow any user mode */
+#define ALLOWMODES_DEFAULT  1 /**< Only allow the subset of modes that are legit defaults */
 
 /** Formatter function for send_user_info().
  * @param who Client being displayed.
@@ -64,8 +66,7 @@ typedef void (*InfoFormatter)(struct Client* who, struct Client *sptr, struct Ms
  */
 extern struct User* make_user(struct Client *cptr);
 extern void         free_user(struct User *user);
-extern int          register_user(struct Client* cptr, struct Client* sptr,
-                                  const char* nick, char* username);
+extern int          register_user(struct Client* cptr, struct Client *sptr);
 
 extern void         user_count_memory(size_t* count_out, size_t* bytes_out);
 
@@ -77,11 +78,10 @@ extern int whisper(struct Client* source, const char* nick,
                    const char* channel, const char* text, int is_notice);
 extern void send_user_info(struct Client* to, char* names, int rpl,
                            InfoFormatter fmt);
-extern int add_silence(struct Client* sptr, const char* mask);
 
 extern int hide_hostmask(struct Client *cptr, unsigned int flags);
 extern int set_user_mode(struct Client *cptr, struct Client *sptr,
-                         int parc, char *parv[]);
+                         int parc, char *parv[], int allow_modes);
 extern int is_silenced(struct Client *sptr, struct Client *acptr);
 extern int hunt_server_cmd(struct Client *from, const char *cmd,
 			   const char *tok, struct Client *one,
@@ -95,7 +95,6 @@ extern struct Client* next_client(struct Client* next, const char* ch);
 extern char *umode_str(struct Client *cptr);
 extern void send_umode(struct Client *cptr, struct Client *sptr,
                        struct Flags *old, int sendset);
-extern int del_silence(struct Client *sptr, char *mask);
 extern void set_snomask(struct Client *, unsigned int, int);
 extern int is_snomask(char *);
 extern int check_target_limit(struct Client *sptr, void *target, const char *name,