revert previous change for now, adjusting based on comments from jsing@

1 files changed, 3 insertions, 10 deletions

diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c
index d3bb79b3fe..6dae066922 100644
--- a/src/lib/libtls/tls.c
+++ b/src/lib/libtls/tls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls.c,v 1.2 2014/12/07 15:00:32 bcook Exp $ */
+/* $OpenBSD: tls.c,v 1.3 2014/12/07 15:48:02 bcook Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -56,22 +56,15 @@ tls_error(struct tls *ctx)
         return ctx->errmsg;
 }
 
-void
-tls_clear_error(struct tls *ctx)
-{
-        ctx->err = 0;
-        free(ctx->errmsg);
-        ctx->errmsg = NULL;
-}
-
 int
 tls_set_error(struct tls *ctx, char *fmt, ...)
 {
         va_list ap;
         int rv;
 
-        tls_clear_error(ctx);
         ctx->err = errno;
+        free(ctx->errmsg);
+        ctx->errmsg = NULL;
 
         va_start(ap, fmt);
         rv = vasprintf(&ctx->errmsg, fmt, ap);