- djm@cvs.openbsd.org 2013/05/17 00:13:13

     [xmalloc.h cipher.c sftp-glob.c ssh-keyscan.c ssh.c sftp-common.c
     ssh-ecdsa.c auth2-chall.c compat.c readconf.c kexgexs.c monitor.c
     gss-genr.c cipher-3des1.c kex.c monitor_wrap.c ssh-pkcs11-client.c
     auth-options.c rsa.c auth2-pubkey.c sftp.c hostfile.c auth2.c
     servconf.c auth.c authfile.c xmalloc.c uuencode.c sftp-client.c
     auth2-gss.c sftp-server.c bufaux.c mac.c session.c jpake.c kexgexc.c
     sshconnect.c auth-chall.c auth2-passwd.c sshconnect1.c buffer.c
     kexecdhs.c kexdhs.c ssh-rsa.c auth1.c ssh-pkcs11.c auth2-kbdint.c
     kexdhc.c sshd.c umac.c ssh-dss.c auth2-jpake.c bufbn.c clientloop.c
     monitor_mm.c scp.c roaming_client.c serverloop.c key.c auth-rsa.c
     ssh-pkcs11-helper.c ssh-keysign.c ssh-keygen.c match.c channels.c
     sshconnect2.c addrmatch.c mux.c canohost.c kexecdhc.c schnorr.c
     ssh-add.c misc.c auth2-hostbased.c ssh-agent.c bufec.c groupaccess.c
     dns.c packet.c readpass.c authfd.c moduli.c]
     bye, bye xfree(); ok markus@

1 files changed, 5 insertions, 5 deletions

diff --git a/dns.c b/dns.c
index 9e3084ba5..630b97ae8 100644
--- a/dns.c
+++ b/dns.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dns.c,v 1.28 2012/05/23 03:28:28 djm Exp $ */
+/* $OpenBSD: dns.c,v 1.29 2013/05/17 00:13:13 djm Exp $ */
 
 /*
  * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -261,7 +261,7 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
 
                 if (hostkey_digest_type != dnskey_digest_type) {
                         hostkey_digest_type = dnskey_digest_type;
-                        xfree(hostkey_digest);
+                        free(hostkey_digest);
 
                         /* Initialize host key parameters */
                         if (!dns_read_key(&hostkey_algorithm,
@@ -281,10 +281,10 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
                             hostkey_digest_len) == 0)
                                 *flags |= DNS_VERIFY_MATCH;
                 }
-                xfree(dnskey_digest);
+                free(dnskey_digest);
         }
 
-        xfree(hostkey_digest); /* from key_fingerprint_raw() */
+        free(hostkey_digest); /* from key_fingerprint_raw() */
         freerrset(fingerprints);
 
         if (*flags & DNS_VERIFY_FOUND)
@@ -327,7 +327,7 @@ export_dns_rr(const char *hostname, Key *key, FILE *f, int generic)
                         for (i = 0; i < rdata_digest_len; i++)
                                 fprintf(f, "%02x", rdata_digest[i]);
                         fprintf(f, "\n");
-                        xfree(rdata_digest); /* from key_fingerprint_raw() */
+                        free(rdata_digest); /* from key_fingerprint_raw() */
                         success = 1;
                 }
         }