strlcpy -> rb_strlcpy

[solanum.git] / src / client.c

diff --git a/src/client.c b/src/client.c
index b383dbee98edc011e055a5fabee3256040991757..497a7b63aad041d5f0e4d0b33205d5db95e3f7f5 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -34,7 +34,6 @@
 #include "irc_string.h"
 #include "sprintf_irc.h"
 #include "ircd.h"
-#include "s_gline.h"
 #include "numeric.h"
 #include "packet.h"
 #include "s_auth.h"
@@ -86,8 +85,7 @@ struct Dictionary *nd_dict = NULL;
 enum
 {
        D_LINED,
-       K_LINED,
-       G_LINED
+       K_LINED
 };
 
 rb_dlink_list dead_list;
@@ -404,7 +402,6 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban)
        static const char conn_closed[] = "Connection closed";
        static const char d_lined[] = "D-lined";
        static const char k_lined[] = "K-lined";
-       static const char g_lined[] = "G-lined";
        const char *reason = NULL;
        const char *exit_reason = conn_closed;
 
@@ -420,9 +417,6 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban)
                case D_LINED:
                        reason = d_lined;
                        break;
-               case G_LINED:
-                       reason = g_lined;
-                       break;
                default:
                        reason = k_lined;
                        break;
@@ -444,7 +438,7 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban)
  * check_banned_lines
  * inputs      - NONE
  * output      - NONE
- * side effects - Check all connections for a pending k/d/gline against the
+ * side effects - Check all connections for a pending k/dline against the
  *               client, exit the client if found.
  */
 void
@@ -495,33 +489,6 @@ check_banned_lines(void)
                        notify_banned_client(client_p, aconf, K_LINED);
                        continue;
                }
-               else if((aconf = find_gline(client_p)) != NULL)
-               {
-                       if(IsExemptKline(client_p))
-                       {
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                               "GLINE over-ruled for %s, client is kline_exempt [%s@%s]",
-                                               get_client_name(client_p, HIDE_IP),
-                                               aconf->user, aconf->host);
-                               continue;
-                       }
-
-                       if(IsExemptGline(client_p))
-                       {
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                               "GLINE over-ruled for %s, client is gline_exempt [%s@%s]",
-                                               get_client_name(client_p, HIDE_IP),
-                                               aconf->user, aconf->host);
-                               continue;
-                       }
-
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                       "GLINE active for %s",
-                                       get_client_name(client_p, HIDE_IP));
-
-                       notify_banned_client(client_p, aconf, G_LINED);
-                       continue;
-               }
                else if((aconf = find_xline(client_p->info, 1)) != NULL)
                {
                        if(IsExemptKline(client_p))
@@ -611,55 +578,6 @@ check_klines(void)
        }
 }
 
-/* check_glines()
- *
- * inputs       -
- * outputs      -
- * side effects - all clients will be checked for glines
- */
-void
-check_glines(void)
-{
-       struct Client *client_p;
-       struct ConfItem *aconf;
-       rb_dlink_node *ptr;
-       rb_dlink_node *next_ptr;
-
-       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
-       {
-               client_p = ptr->data;
-
-               if(IsMe(client_p) || !IsPerson(client_p))
-                       continue;
-
-               if((aconf = find_gline(client_p)) != NULL)
-               {
-                       if(IsExemptKline(client_p))
-                       {
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                                    "GLINE over-ruled for %s, client is kline_exempt",
-                                                    get_client_name(client_p, HIDE_IP));
-                               continue;
-                       }
-
-                       if(IsExemptGline(client_p))
-                       {
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                                    "GLINE over-ruled for %s, client is gline_exempt",
-                                                    get_client_name(client_p, HIDE_IP));
-                               continue;
-                       }
-
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                            "GLINE active for %s",
-                                            get_client_name(client_p, HIDE_IP));
-
-                       notify_banned_client(client_p, aconf, K_LINED);
-                       continue;
-               }
-       }
-}
-
 /* check_dlines()
  *
  * inputs       -
@@ -1313,7 +1231,7 @@ dead_link(struct Client *client_p)
        abt = (struct abort_client *) rb_malloc(sizeof(struct abort_client));
 
        if(client_p->flags & FLAGS_SENDQEX)
-               strlcpy(abt->notice, "Max SendQ exceeded", sizeof(abt->notice));
+               rb_strlcpy(abt->notice, "Max SendQ exceeded", sizeof(abt->notice));
        else
                rb_snprintf(abt->notice, sizeof(abt->notice), "Write error: %s", strerror(errno));
 
@@ -2037,9 +1955,9 @@ close_connection(struct Client *client_p)
        {
                struct server_conf *server_p;
 
-               ServerStats.is_sv++;\r
-               ServerStats.is_sbs += client_p->localClient->sendB;\r
-               ServerStats.is_sbr += client_p->localClient->receiveB;\r
+               ServerStats.is_sv++;
+               ServerStats.is_sbs += client_p->localClient->sendB;
+               ServerStats.is_sbr += client_p->localClient->receiveB;
                ServerStats.is_sti += rb_current_time() - client_p->localClient->firsttime;
 
                /*
@@ -2063,9 +1981,9 @@ close_connection(struct Client *client_p)
        }
        else if(IsClient(client_p))
        {
-               ServerStats.is_cl++;\r
-               ServerStats.is_cbs += client_p->localClient->sendB;\r
-               ServerStats.is_cbr += client_p->localClient->receiveB;\r
+               ServerStats.is_cl++;
+               ServerStats.is_cbs += client_p->localClient->sendB;
+               ServerStats.is_cbr += client_p->localClient->receiveB;
                ServerStats.is_cti += rb_current_time() - client_p->localClient->firsttime;
        }
        else
@@ -2135,7 +2053,7 @@ error_exit_client(struct Client *client_p, int error)
        }
 
        if(error == 0)
-               strlcpy(errmsg, "Remote host closed the connection", sizeof(errmsg));
+               rb_strlcpy(errmsg, "Remote host closed the connection", sizeof(errmsg));
        else
                rb_snprintf(errmsg, sizeof(errmsg), "Read error: %s", strerror(current_error));