Add chmode +N, which prevents nickchanges.

[irc/rqf/shadowircd.git] / modules / core / m_nick.c

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index 1d3cc19ec28a7aa70dbb2924842fb39d73ee2ce8..eec78faf9d8a75e3ac2a17e9d3ff6cd7b89d6c24 100644 (file)
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -108,7 +108,6 @@ static int perform_nickchange_collides(struct Client *, struct Client *,
                                       struct Client *, int, const char **, time_t, const char *);
 
 /* mr_nick()
- *       parv[0] = sender prefix
  *       parv[1] = nickname
  */
 static int
@@ -145,7 +144,7 @@ mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
        if(!clean_nick(nick, 1))
        {
                sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME),
-                          me.name, EmptyString(parv[0]) ? "*" : parv[0], parv[1]);
+                          me.name, EmptyString(source_p->name) ? "*" : source_p->name, parv[1]);
                return 0;
        }
 
@@ -175,7 +174,6 @@ mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
 }
 
 /* m_nick()
- *     parv[0] = sender prefix
  *     parv[1] = nickname
  */
 static int
@@ -208,7 +206,7 @@ m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *p
        /* check the nickname is ok */
        if(!clean_nick(nick, 1))
        {
-               sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME), me.name, parv[0], nick);
+               sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME), me.name, source_p->name, nick);
                return 0;
        }
 
@@ -245,7 +243,7 @@ m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *p
                        change_local_nick(client_p, source_p, nick, 1);
                }
                else
-                       sendto_one(source_p, form_str(ERR_NICKNAMEINUSE), me.name, parv[0], nick);
+                       sendto_one(source_p, form_str(ERR_NICKNAMEINUSE), me.name, source_p->name, nick);
 
                return 0;
        }
@@ -258,7 +256,6 @@ m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *p
 /* mc_nick()
  *      
  * server -> server nick change
- *    parv[0] = sender prefix
  *    parv[1] = nickname
  *    parv[2] = TS when nick change
  */
@@ -389,7 +386,7 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
        {
                char *s = LOCAL_COPY(parv[9]);
                sendto_realops_snomask(SNO_GENERAL, L_ALL, "Long realname from server %s for %s",
-                                    parv[0], parv[1]);
+                                    source_p->name, parv[1]);
                s[REALLEN] = '\0';
                parv[9] = s;
        }
@@ -490,7 +487,7 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
        {
                char *s = LOCAL_COPY(parv[11]);
                sendto_realops_snomask(SNO_GENERAL, L_ALL, "Long realname from server %s for %s",
-                                    parv[0], parv[1]);
+                                    source_p->name, parv[1]);
                s[REALLEN] = '\0';
                parv[11] = s;
        }
@@ -694,6 +691,16 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
                                        nick, chptr->chname);
                        return;
                }
+
+               chptr = find_nonickchange_channel(source_p);
+               if (chptr != NULL)
+               {
+                       sendto_one_numeric(source_p, ERR_NONICK,
+                                       form_str(ERR_NONICK),
+                                       chptr->chname);
+                       return;
+               }
+
                if((source_p->localClient->last_nick_change + ConfigFileEntry.max_nick_time) < rb_current_time())
                        source_p->localClient->number_of_nick_changes = 0;
 
@@ -931,7 +938,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
                                (void) exit_client(client_p, target_p, &me, "Nick collision");
                        }
 
-                       register_client(client_p, parc >= 10 ? source_p : NULL,
+                       register_client(client_p, source_p,
                                        nick, newts, parc, parv);
 
                        return 0;
@@ -1090,19 +1097,6 @@ register_client(struct Client *client_p, struct Client *server,
        const char *m;
        int flag;
 
-       if(server == NULL)
-       {
-               if((server = find_server(NULL, parv[7])) == NULL)
-               {
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                            "Ghost killed: %s on invalid server %s",
-                                            nick, parv[7]);
-                       sendto_one(client_p, ":%s KILL %s :%s (Server doesn't exist)",
-                                       get_id(&me, client_p), nick, me.name);
-                       return 0;
-               }
-       }
-
        source_p = make_client(client_p);
        user = make_user(source_p);
        rb_dlinkAddTail(source_p, &source_p->node, &global_client_list);
@@ -1139,7 +1133,7 @@ register_client(struct Client *client_p, struct Client *server,
        }
        else
        {
-               rb_strlcpy(source_p->info, parv[8], sizeof(source_p->info));
+               s_assert(0);
        }
 
        /* remove any nd entries for this nick */
@@ -1200,23 +1194,6 @@ register_client(struct Client *client_p, struct Client *server,
 
        rb_dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
 
-       /* fake direction */
-       if(source_p->servptr->from != source_p->from)
-       {
-               struct Client *target_p = source_p->servptr->from;
-
-               sendto_realops_snomask(SNO_DEBUG, L_ALL,
-                                    "Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
-                                    client_p->name, source_p->name,
-                                    source_p->username, source_p->host,
-                                    server->name, target_p->name, target_p->from->name);
-               kill_client(client_p, source_p,
-                           "%s (NICK from wrong direction (%s != %s))",
-                           me.name, server->name, target_p->from->name);
-               source_p->flags |= FLAGS_KILLED;
-               return exit_client(source_p, source_p, &me, "USER server wrong direction");
-       }
-
        call_hook(h_new_remote_user, source_p);
 
        return (introduce_client(client_p, source_p, user, nick, parc == 12));