m_info: Correct description of general::client_exit like in example confs.

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

diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index dc05c005b05206db06167e18403d431b9c6056a8..b9ae59c03db8c21116309883b36bd011ccdd51b2 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
@@ -76,6 +75,8 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
        const char *name;
        struct Client *target_p;
        int hop;
+       unsigned int required_mask;
+       const char *missing;
 
        name = parv[1];
        hop = atoi(parv[2]);
@@ -134,14 +135,14 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
        case -2:
                sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
                                     "Unauthorised server connection attempt from %s: "
-                                    "Bad password for server %s",
+                                    "Bad credentials for server %s",
                                     "[@255.255.255.255]", name);
 
-               ilog(L_SERVER, "Access denied, invalid password for server %s%s",
+               ilog(L_SERVER, "Access denied, invalid credentials for server %s%s",
                     EmptyString(client_p->name) ? name : "",
                     log_client_name(client_p, SHOW_IP));
 
-               exit_client(client_p, client_p, client_p, "Invalid password.");
+               exit_client(client_p, client_p, client_p, "Invalid credentials.");
                return 0;
                /* NOT REACHED */
                break;
@@ -193,6 +194,28 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
                return 0;
        }
 
+       /* check to ensure any "required" caps are set. --nenolod */
+       required_mask = capability_index_get_required(serv_capindex);
+       if (!IsCapable(client_p, required_mask))
+       {
+               missing = capability_index_list(serv_capindex, required_mask &
+                               ~client_p->localClient->caps);
+               sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
+                                       "Link %s dropped, required CAPABs [%s] are missing",
+                                       name, missing);
+               ilog(L_SERVER, "Link %s%s dropped, required CAPABs [%s] are missing",
+                               EmptyString(client_p->name) ? name : "",
+                               log_client_name(client_p, SHOW_IP), missing);
+               /* Do not use '[' in the below message because it would cause
+                * it to be considered potentially unsafe (might disclose IP
+                * addresses)
+                */
+               sendto_one(client_p, "ERROR :Missing required CAPABs (%s)", missing);
+               exit_client(client_p, client_p, client_p, "Missing required CAPABs");
+
+               return 0;
+       }
+
        if((target_p = find_server(NULL, name)))
        {
                /*
@@ -206,13 +229,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 +284,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
@@ -465,13 +498,10 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
        struct remote_conf *hub_p;
        hook_data_client hdata;
        rb_dlink_node *ptr;
-       int hop;
        int hlined = 0;
        int llined = 0;
        char squitreason[160];
 
-       hop = atoi(parv[2]);
-
        /* collision on the name? */
        if((target_p = find_server(NULL, parv[1])) != NULL)
        {
@@ -633,7 +663,6 @@ set_server_gecos(struct Client *client_p, const char *info)
        {
                char *p;
                char *s;
-               char *t;
 
                s = LOCAL_COPY(info);
 
@@ -642,7 +671,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)