]> git.ipfire.org Git - thirdparty/unbound.git/commitdiff
nicely outlined
authorMatthijs Mekking <matje@nlnetlabs.nl>
Mon, 17 Jan 2011 13:59:07 +0000 (13:59 +0000)
committerMatthijs Mekking <matje@nlnetlabs.nl>
Mon, 17 Jan 2011 13:59:07 +0000 (13:59 +0000)
git-svn-id: file:///svn/unbound/trunk@2378 be551aaa-1e26-0410-a405-d3ace91eadb9

services/cache/rrset.c
services/listen_dnsport.c

index 0838dfdb276348952c212f930df65ef0211a8260..33660f89fb4018cff8d4718e130a621fc68cbea3 100644 (file)
@@ -145,8 +145,8 @@ need_to_update_rrset(void* nd, void* cd, uint32_t timenow, int equal, int ns)
        /*      o item in cache has expired */
        if( cached->ttl < timenow )
                return 1;
-        /*      o same trust, but different in data - insert it */
-        if( newd->trust == cached->trust && !equal ) {
+       /*  o same trust, but different in data - insert it */
+       if( newd->trust == cached->trust && !equal ) {
                /* if this is type NS, do not 'stick' to owner that changes
                 * the NS RRset, but use the old TTL for the new data, and
                 * update to fetch the latest data. ttl is not expired, because
@@ -158,9 +158,9 @@ need_to_update_rrset(void* nd, void* cd, uint32_t timenow, int equal, int ns)
                                if(newd->rr_ttl[i] > newd->ttl)
                                        newd->rr_ttl[i] = newd->ttl;
                }
-                return 1;
+               return 1;
        }
-        return 0;
+       return 0;
 }
 
 /** Update RRSet special key ID */
index 1f3ba56841c818bda5b7303ea88dee5a3a8da4f2..dd416a249d2d2e3c7ffe51a1c406dc8089e15feb 100644 (file)
@@ -437,10 +437,12 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto)
                /* detect freebsd jail with no ipv6 permission */
                if(addr->ai_family==AF_INET6 && errno==EINVAL)
                        *noproto = 1;
-               else { log_err("can't bind socket: %s", strerror(errno));
-                      log_addr(0, "failed address",
+               else {
+                       log_err("can't bind socket: %s", strerror(errno));
+                       log_addr(0, "failed address",
                                (struct sockaddr_storage*)addr->ai_addr,
-                               addr->ai_addrlen); }
+                               addr->ai_addrlen);
+               }
 #else
                log_err("can't bind socket: %s", 
                        wsa_strerror(WSAGetLastError()));