Add new topic command ETB, allowing services to set topic+setter+ts always

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

diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index dc05c005b05206db06167e18403d431b9c6056a8..e4abd359dd954f9218e98db8874585e27d4bf222 100644 (file)
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -64,7 +64,6 @@ static int set_server_gecos(struct Client *, const char *);
 
 /*
  * mr_server - SERVER message handler
- *      parv[0] = sender prefix
  *      parv[1] = servername
  *      parv[2] = serverinfo/hopcount
  *      parv[3] = serverinfo
@@ -206,13 +205,24 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
                 * Definitely don't do that here. This is from an unregistered
                 * connect - A1kmm.
                 */
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                    "Attempt to re-introduce server %s from %s",
-                                    name, "[@255.255.255.255]");
-               ilog(L_SERVER, "Attempt to re-introduce server %s from %s",
-                               name, log_client_name(client_p, SHOW_IP));
+               if (target_p->servptr->flags & FLAGS_SERVICE)
+               {
+                       /* Assume any servers introduced by services
+                        * are jupes.
+                        * -- jilles
+                        */
+                       sendto_one(client_p, "ERROR :Server juped.");
+               }
+               else
+               {
+                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                                            "Attempt to re-introduce server %s from %s",
+                                            name, "[@255.255.255.255]");
+                       ilog(L_SERVER, "Attempt to re-introduce server %s from %s",
+                                       name, log_client_name(client_p, SHOW_IP));
 
-               sendto_one(client_p, "ERROR :Server already exists.");
+                       sendto_one(client_p, "ERROR :Server already exists.");
+               }
                exit_client(client_p, client_p, client_p, "Server Exists");
                return 0;
        }
@@ -250,7 +260,6 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 
 /*
  * ms_server - SERVER message handler
- *      parv[0] = sender prefix
  *      parv[1] = servername
  *      parv[2] = serverinfo/hopcount
  *      parv[3] = serverinfo
@@ -633,7 +642,6 @@ set_server_gecos(struct Client *client_p, const char *info)
        {
                char *p;
                char *s;
-               char *t;
 
                s = LOCAL_COPY(info);
 
@@ -642,7 +650,7 @@ set_server_gecos(struct Client *client_p, const char *info)
                        *p = '\0';
 
                /* check for a ] which would symbolise an [IP] */
-               if((t = strchr(s, ']')))
+               if(strchr(s, ']'))
                {
                        /* set s to after the first space */
                        if(p)