Show libratbox version info to opers in /info.

[solanum.git] / modules / core / m_server.c

diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index ba3d4467dc7a3a85aea15af9b5c7fb040ea8fcde..86ff95c4d08496f0809b997429326c84b776c66b 100644 (file)
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -206,13 +206,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.
                 */
                 * 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;
        }
                exit_client(client_p, client_p, client_p, "Server Exists");
                return 0;
        }


@@ -332,11 +343,6 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
         * add it to list and propagate word to my other
         * server links...
         */
         * add it to list and propagate word to my other
         * server links...
         */

-       if(parc == 1 || EmptyString(info))
-       {
-               sendto_one(client_p, "ERROR :No server info specified for %s", name);
-               return 0;
-       }

 
        /*
         * See if the newly found server is behind a guaranteed
 
        /*
         * See if the newly found server is behind a guaranteed