aboutsummaryrefslogtreecommitdiff
path: root/website/static/security/patches/SA-15:05/bind.patch
blob: 4c546b41d9d89f46a73e368780cad7f8478cb926 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
Index: contrib/bind9/lib/dns/zone.c
===================================================================
--- contrib/bind9/lib/dns/zone.c	(revision 278973)
+++ contrib/bind9/lib/dns/zone.c	(working copy)
@@ -8496,6 +8496,12 @@ keyfetch_done(isc_task_t *task, isc_event_t *event
 					     namebuf, tag);
 				trustkey = ISC_TRUE;
 			}
+		} else {
+			/*
+			 * No previously known key, and the key is not
+			 * secure, so skip it.
+			 */
+			continue;
 		}
 
 		/* Delete old version */
@@ -8544,7 +8550,7 @@ keyfetch_done(isc_task_t *task, isc_event_t *event
 			trust_key(zone, keyname, &dnskey, mctx);
 		}
 
-		if (!deletekey)
+		if (secure && !deletekey)
 			set_refreshkeytimer(zone, &keydata, now);
 	}