Run configure -update on all svn/git changes

[user/henk/code/inspircd.git] / src / user_resolver.cpp

diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp
index 95fa13eaf65e015c8f3afc5d090f07f6547bff0d..b37d112feef60824326a8c6fb31070836a218ec4 100644 (file)
--- a/src/user_resolver.cpp
+++ b/src/user_resolver.cpp
@@ -34,17 +34,14 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
                        if (this->bound_user->registered != REG_ALL)
                        {
                                bool lcached = false;
-#ifdef IPV6
-                               if (this->bound_user->ip.sa.sa_family == AF_INET6)
+                               if (this->bound_user->client_sa.sa.sa_family == AF_INET6)
                                {
                                        /* IPV6 forward lookup */
                                        res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_AAAA, lcached);
                                }
                                else
-                                       /* IPV4 lookup (mixed protocol mode) */
-#endif
                                {
-                                       /* IPV4 lookup (ipv4 only mode) */
+                                       /* IPV4 lookup */
                                        res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, lcached);
                                }
                                this->ServerInstance->AddResolver(res_forward, lcached);
@@ -59,9 +56,8 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
        {
                /* Both lookups completed */
 
-               irc::sockets::sockaddrs* user_ip = &this->bound_user->ip;
+               irc::sockets::sockaddrs* user_ip = &this->bound_user->client_sa;
                bool rev_match = false;
-#ifdef IPV6
                if (user_ip->sa.sa_family == AF_INET6)
                {
                        struct in6_addr res_bin;
@@ -71,7 +67,6 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
                        }
                }
                else
-#endif
                {
                        struct in_addr res_bin;
                        if (inet_pton(AF_INET, result.c_str(), &res_bin))