summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--dns.c8
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e0a0606b..3c7577fb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@
27 [gss-serv-krb5.c gss-serv.c] 27 [gss-serv-krb5.c gss-serv.c]
28 unused declarations; ok deraadt@ 28 unused declarations; ok deraadt@
29 (id sync only for gss-serv-krb5.c) 29 (id sync only for gss-serv-krb5.c)
30 - stevesk@cvs.openbsd.org 2005/10/13 19:13:41
31 [dns.c]
32 unneeded #include, unused declaration, little knf; ok deraadt@
30 33
3120051102 3420051102
32 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). 35 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
@@ -3160,4 +3163,4 @@
3160 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3163 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3161 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3164 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3162 3165
3163$Id: ChangeLog,v 1.3932 2005/11/05 04:05:28 djm Exp $ 3166$Id: ChangeLog,v 1.3933 2005/11/05 04:06:38 djm Exp $
diff --git a/dns.c b/dns.c
index 4487c1aba..a62f43900 100644
--- a/dns.c
+++ b/dns.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dns.c,v 1.12 2005/06/17 02:44:32 djm Exp $ */ 1/* $OpenBSD: dns.c,v 1.13 2005/10/13 19:13:41 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Wesley Griffin. All rights reserved. 4 * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -40,10 +40,8 @@
40#include "key.h" 40#include "key.h"
41#include "dns.h" 41#include "dns.h"
42#include "log.h" 42#include "log.h"
43#include "uuencode.h"
44 43
45extern char *__progname; 44RCSID("$OpenBSD: dns.c,v 1.13 2005/10/13 19:13:41 stevesk Exp $");
46RCSID("$OpenBSD: dns.c,v 1.12 2005/06/17 02:44:32 djm Exp $");
47 45
48#ifndef LWRES 46#ifndef LWRES
49static const char *errset_text[] = { 47static const char *errset_text[] = {
@@ -223,7 +221,7 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
223 if (fingerprints->rri_nrdatas) 221 if (fingerprints->rri_nrdatas)
224 *flags |= DNS_VERIFY_FOUND; 222 *flags |= DNS_VERIFY_FOUND;
225 223
226 for (counter = 0 ; counter < fingerprints->rri_nrdatas ; counter++) { 224 for (counter = 0; counter < fingerprints->rri_nrdatas; counter++) {
227 /* 225 /*
228 * Extract the key from the answer. Ignore any badly 226 * Extract the key from the answer. Ignore any badly
229 * formatted fingerprints. 227 * formatted fingerprints.