- 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, 8 insertions, 8 deletions

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index c9de130f4..8b807c10a 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.86 2012/04/11 13:34:17 djm Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.87 2013/05/17 00:13:14 djm Exp $ */
 /*
  * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
  *
@@ -263,7 +263,7 @@ keygrab_ssh2(con *c)
                 exit(1);
         }
         nonfatal_fatal = 0;
-        xfree(c->c_kex);
+        free(c->c_kex);
         c->c_kex = NULL;
         packet_close();
 
@@ -329,7 +329,7 @@ conalloc(char *iname, char *oname, int keytype)
         do {
                 name = xstrsep(&namelist, ",");
                 if (!name) {
-                        xfree(namebase);
+                        free(namebase);
                         return (-1);
                 }
         } while ((s = tcpconnect(name)) < 0);
@@ -363,10 +363,10 @@ confree(int s)
         if (s >= maxfd || fdcon[s].c_status == CS_UNUSED)
                 fatal("confree: attempt to free bad fdno %d", s);
         close(s);
-        xfree(fdcon[s].c_namebase);
-        xfree(fdcon[s].c_output_name);
+        free(fdcon[s].c_namebase);
+        free(fdcon[s].c_output_name);
         if (fdcon[s].c_status == CS_KEYS)
-                xfree(fdcon[s].c_data);
+                free(fdcon[s].c_data);
         fdcon[s].c_status = CS_UNUSED;
         fdcon[s].c_keytype = 0;
         TAILQ_REMOVE(&tq, &fdcon[s], c_link);
@@ -553,8 +553,8 @@ conloop(void)
                 } else if (FD_ISSET(i, r))
                         conread(i);
         }
-        xfree(r);
-        xfree(e);
+        free(r);
+        free(e);
 
         c = TAILQ_FIRST(&tq);
         while (c && (c->c_tv.tv_sec < now.tv_sec ||