fix dumb error
authoraland <aland>
Fri, 22 Apr 2005 23:20:41 +0000 (23:20 +0000)
committeraland <aland>
Fri, 22 Apr 2005 23:20:41 +0000 (23:20 +0000)
src/main/auth.c
src/modules/rlm_realm/rlm_realm.c

index e85d482..3407d36 100644 (file)
@@ -590,7 +590,7 @@ autz_redo:
                 *      realm (sigh).
                 */
                realm = realm_find(tmp->strvalue, 0);
-               rad_assert(realm->ipaddr.af == AF_INET);
+               rad_assert((realm == NULL) || (realm->ipaddr.af == AF_INET));
                if (realm && (realm->ipaddr.ipaddr.ip4addr.s_addr == htonl(INADDR_NONE))) {
                        DEBUG2("  WARNING: You set Proxy-To-Realm = %s, but it is a LOCAL realm!  Cancelling invalid proxy request.", realm->realm);
                } else {
index 8c0fb89..d6e6ed4 100644 (file)
@@ -81,14 +81,14 @@ static int check_for_realm(void *instance, REQUEST *request, REALM **returnrealm
 
         struct realm_config_t *inst = instance;
 
+       /* initiate returnrealm */
+       *returnrealm = NULL;
+
        if (request->packet->src_ipaddr.af != AF_INET) {
                DEBUG2("rlm_realm: IPv6 is not supported!");
                return 0;
        }
 
-       /* initiate returnrealm */
-       *returnrealm = NULL;
-
        /*
         *      If the request has a proxy entry, then it's a proxy
         *      reply, and we're walking through the module list again.