'You are exempt from...' message fixed - glines gone

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

diff --git a/src/irc_string.c b/src/irc_string.c
index a32c1ccbbe2bc6c09a7890c1c57945c1456f0a87..5951dd65862a18a026ce9fa20f91f4ec9b17d487 100644 (file)
--- a/src/irc_string.c
+++ b/src/irc_string.c
@@ -34,7 +34,7 @@
 #define INADDRSZ 4
 #endif
 
-#ifdef IPV6
+#ifdef RB_IPV6
 #ifndef IN6ADDRSZ
 #define IN6ADDRSZ 16
 #endif
@@ -398,7 +398,7 @@ inetntoa(const char *in)
  */
 
 static const char *inet_ntop4(const u_char * src, char *dst, unsigned int size);
-#ifdef IPV6
+#ifdef RB_IPV6
 static const char *inet_ntop6(const u_char * src, char *dst, unsigned int size);
 #endif
 
@@ -427,7 +427,7 @@ inet_ntop4(const unsigned char *src, char *dst, unsigned int size)
  * author:
  *     Paul Vixie, 1996.
  */
-#ifdef IPV6
+#ifdef RB_IPV6
 static const char *
 inet_ntop6(const unsigned char *src, char *dst, unsigned int size)
 {
@@ -539,15 +539,15 @@ inetpton_sock(const char *src, struct sockaddr *dst)
        {
                ((struct sockaddr_in *) dst)->sin_port = 0;
                ((struct sockaddr_in *) dst)->sin_family = AF_INET;
-               SET_SS_LEN((struct irc_sockaddr_storage *) dst, sizeof(struct sockaddr_in));
+               SET_SS_LEN((struct rb_sockaddr_storage *) dst, sizeof(struct sockaddr_in));
                return 1;
        }
-#ifdef IPV6
+#ifdef RB_IPV6
        else if(inetpton(AF_INET6, src, &((struct sockaddr_in6 *) dst)->sin6_addr))
        {
                ((struct sockaddr_in6 *) dst)->sin6_port = 0;
                ((struct sockaddr_in6 *) dst)->sin6_family = AF_INET6;
-               SET_SS_LEN((struct irc_sockaddr_storage *) dst, sizeof(struct sockaddr_in6));
+               SET_SS_LEN((struct rb_sockaddr_storage *) dst, sizeof(struct sockaddr_in6));
                return 1;
        }
 #endif
@@ -562,7 +562,7 @@ inetntop_sock(struct sockaddr *src, char *dst, unsigned int size)
        case AF_INET:
                return (inetntop(AF_INET, &((struct sockaddr_in *) src)->sin_addr, dst, size));
                break;
-#ifdef IPV6
+#ifdef RB_IPV6
        case AF_INET6:
                return (inetntop(AF_INET6, &((struct sockaddr_in6 *) src)->sin6_addr, dst, size));
                break;
@@ -588,7 +588,7 @@ inetntop(int af, const void *src, char *dst, unsigned int size)
        {
        case AF_INET:
                return (inet_ntop4(src, dst, size));
-#ifdef IPV6
+#ifdef RB_IPV6
        case AF_INET6:
                if(IN6_IS_ADDR_V4MAPPED((const struct in6_addr *) src) ||
                   IN6_IS_ADDR_V4COMPAT((const struct in6_addr *) src))
@@ -677,7 +677,7 @@ inet_pton4(src, dst)
        return (1);
 }
 
-#ifdef IPV6
+#ifdef RB_IPV6
 /* int
  * inet_pton6(src, dst)
  *     convert presentation level address to network order binary form.
@@ -803,7 +803,7 @@ inetpton(af, src, dst)
        {
        case AF_INET:
                return (inet_pton4(src, dst));
-#ifdef IPV6
+#ifdef RB_IPV6
        case AF_INET6:
                /* Somebody might have passed as an IPv4 address this is sick but it works */
                if(inet_pton4(src, dst))