Applying dyn-cmodes.diff - first step in implementing channel module

[irc/rqf/shadowircd.git] / src / s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index 98bd9b602dafc661a69a9dad2fdb3bcb0fcd3213..a0060d2190b422e5f66911da0a53eeaa86b0df72 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -35,8 +35,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "listener.h"
 #include "hostmask.h"
@@ -51,7 +50,7 @@
 
 struct config_server_hide ConfigServerHide;
 
-extern int yyparse();          /* defined in y.tab.c */
+extern int yyparse(void);              /* defined in y.tab.c */
 extern char linebuf[];
 
 #ifndef INADDR_NONE
@@ -258,7 +257,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
                        /* why ipaddr, and not just source_p->sockhost? --fl */
 #if 0
                        static char ipaddr[HOSTIPLEN];
-                       inetntop_sock(&source_p->localClient->ip, ipaddr, sizeof(ipaddr));
+                       rb_inet_ntop_sock(&source_p->localClient->ip, ipaddr, sizeof(ipaddr));
 #endif
                        sendto_realops_snomask(SNO_UNAUTH, L_ALL,
                                        "Unauthorised client connection from "
@@ -313,8 +312,8 @@ verify_access(struct Client *client_p, const char *username)
        }
        else
        {
-               strlcpy(non_ident, "~", sizeof(non_ident));
-               strlcat(non_ident, username, sizeof(non_ident));
+               rb_strlcpy(non_ident, "~", sizeof(non_ident));
+               rb_strlcat(non_ident, username, sizeof(non_ident));
                aconf = find_address_conf(client_p->host, client_p->sockhost,
                                        non_ident, client_p->username,
                                        (struct sockaddr *) &client_p->localClient->ip,
@@ -356,14 +355,14 @@ verify_access(struct Client *client_p, const char *username)
                                char *host = p+1;
                                *p = '\0';
 
-                               strlcpy(client_p->username, aconf->name,
+                               rb_strlcpy(client_p->username, aconf->name,
                                        sizeof(client_p->username));
-                               strlcpy(client_p->host, host,
+                               rb_strlcpy(client_p->host, host,
                                        sizeof(client_p->host));
                                *p = '@';
                        }
                        else
-                               strlcpy(client_p->host, aconf->name, sizeof(client_p->host));
+                               rb_strlcpy(client_p->host, aconf->name, sizeof(client_p->host));
                }
                return (attach_iline(client_p, aconf));
        }
@@ -616,9 +615,9 @@ rehash(int sig)
        read_conf_files(NO);
 
        if(ServerInfo.description != NULL)
-               strlcpy(me.info, ServerInfo.description, sizeof(me.info));
+               rb_strlcpy(me.info, ServerInfo.description, sizeof(me.info));
        else
-               strlcpy(me.info, "unknown", sizeof(me.info));
+               rb_strlcpy(me.info, "unknown", sizeof(me.info));
 
        open_logfiles();
        return (0);
@@ -899,35 +898,6 @@ validate_conf(void)
        }
 }
 
-/*
- * lookup_confhost - start DNS lookups of all hostnames in the conf
- * line and convert an IP addresses in a.b.c.d number for to IP#s.
- *
- */
-
-/*
- * conf_connect_allowed
- *
- * inputs      - pointer to inaddr
- *             - int type ipv4 or ipv6
- * output      - ban info or NULL
- * side effects        - none
- */
-struct ConfItem *
-conf_connect_allowed(struct sockaddr *addr, int aftype)
-{
-       struct ConfItem *aconf = find_dline(addr, aftype);
-
-       /* DLINE exempt also gets you out of static limits/pacing... */
-       if(aconf && (aconf->status & CONF_EXEMPTDLINE))
-               return NULL;
-
-       if(aconf != NULL)
-               return aconf;
-
-       return NULL;
-}
-
 /* add_temp_kline()
  *
  * inputs        - pointer to struct ConfItem
@@ -1162,7 +1132,7 @@ read_conf_files(int cold)
 
           - Gozem 2002-07-21 
         */
-       strlcpy(conffilebuf, filename, sizeof(conffilebuf));
+       rb_strlcpy(conffilebuf, filename, sizeof(conffilebuf));
 
        if((conf_fbfile_in = fopen(filename, "r")) == NULL)
        {
@@ -1508,6 +1478,24 @@ conf_add_d_conf(struct ConfItem *aconf)
        }
 }
 
+static char *
+strip_tabs(char *dest, const char *src, size_t len)
+{
+       char *d = dest;
+
+       if(dest == NULL || src == NULL)
+               return NULL;
+
+       rb_strlcpy(dest, src, len);
+
+       while(*d)
+       {
+               if(*d == '\t')
+                       *d = ' ';
+               d++;
+       }
+       return dest;
+}
 
 /*
  * yyerror
@@ -1521,7 +1509,7 @@ yyerror(const char *msg)
 {
        char newlinebuf[BUFSIZE];
 
-       strip_tabs(newlinebuf, (const unsigned char *) linebuf, strlen(linebuf));
+       strip_tabs(newlinebuf, linebuf, strlen(linebuf));
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "\"%s\", line %d: %s at '%s'",
                             conffilebuf, lineno + 1, msg, newlinebuf);