merge 6.3p1

1 files changed, 2 insertions, 2 deletions

diff --git a/readpass.c b/readpass.c
index 599c8ef9a..e37d31158 100644
--- a/readpass.c
+++ b/readpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readpass.c,v 1.48 2010/12/15 00:49:27 djm Exp $ */
+/* $OpenBSD: readpass.c,v 1.49 2013/05/17 00:13:14 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -186,7 +186,7 @@ ask_permission(const char *fmt, ...)
                 if (*p == '\0' || *p == '\n' ||
                     strcasecmp(p, "yes") == 0)
                         allowed = 1;
-                xfree(p);
+                free(p);
         }
 
         return (allowed);