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

diff --git a/misc.c b/misc.c
index 77f4a37a1..4aa5fdc8b 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.88 2013/04/24 16:01:46 tedu Exp $ */
+/* $OpenBSD: misc.c,v 1.89 2013/05/17 00:13:13 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -253,13 +253,13 @@ a2tun(const char *s, int *remote)
                 *remote = SSH_TUNID_ANY;
                 sp = xstrdup(s);
                 if ((ep = strchr(sp, ':')) == NULL) {
-                        xfree(sp);
+                        free(sp);
                         return (a2tun(s, NULL));
                 }
                 ep[0] = '\0'; ep++;
                 *remote = a2tun(ep, NULL);
                 tun = a2tun(sp, NULL);
-                xfree(sp);
+                free(sp);
                 return (*remote == SSH_TUNID_ERR ? *remote : tun);
         }
 
@@ -492,7 +492,7 @@ replacearg(arglist *args, u_int which, char *fmt, ...)
         if (which >= args->num)
                 fatal("replacearg: tried to replace invalid arg %d >= %d",
                     which, args->num);
-        xfree(args->list[which]);
+        free(args->list[which]);
         args->list[which] = cp;
 }
 
@@ -503,8 +503,8 @@ freeargs(arglist *args)
 
         if (args->list != NULL) {
                 for (i = 0; i < args->num; i++)
-                        xfree(args->list[i]);
-                xfree(args->list);
+                        free(args->list[i]);
+                free(args->list);
                 args->nalloc = args->num = 0;
                 args->list = NULL;
         }