From c2f0959783c0bd521f1e74528e1c33ce620f34a4 Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Sat, 1 Jun 2013 21:31:17 +0000
Subject:    - 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@

---
 authfile.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'authfile.c')

diff --git a/authfile.c b/authfile.c
index 91812bf8..63ae16bb 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.96 2013/04/19 01:06:50 djm Exp $ */
+/* $OpenBSD: authfile.c,v 1.97 2013/05/17 00:13:13 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -509,8 +509,8 @@ key_parse_private_rsa1(Buffer *blob, const char *passphrase, char **commentp)
 	return prv;
 
 fail:
-	if (commentp)
-		xfree(*commentp);
+	if (commentp != NULL)
+		free(*commentp);
 	key_free(prv);
 	return NULL;
 }
@@ -832,10 +832,10 @@ key_load_cert(const char *filename)
 	pub = key_new(KEY_UNSPEC);
 	xasprintf(&file, "%s-cert.pub", filename);
 	if (key_try_load_public(pub, file, NULL) == 1) {
-		xfree(file);
+		free(file);
 		return pub;
 	}
-	xfree(file);
+	free(file);
 	key_free(pub);
 	return NULL;
 }
-- 
cgit v1.2.1