1 files changed, 17 insertions, 14 deletions

diff --git a/auth-skey.c b/auth-skey.c
index f676dbec9..cb43dba48 100644
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth-skey.c,v 1.27 2007/01/21 01:41:54 stevesk Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -21,15 +22,23 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #include "includes.h"
-RCSID("$OpenBSD: auth-skey.c,v 1.20 2002/06/30 21:59:45 deraadt Exp $");
 
 #ifdef SKEY
 
+#include <sys/types.h>
+
+#include <pwd.h>
+#include <stdio.h>
+
 #include <skey.h>
 
 #include "xmalloc.h"
+#include "key.h"
+#include "hostfile.h"
 #include "auth.h"
+#include "ssh-gss.h"
 #include "monitor_wrap.h"
 
 static void *
@@ -43,26 +52,20 @@ skey_query(void *ctx, char **name, char **infotxt,
     u_int* numprompts, char ***prompts, u_int **echo_on)
 {
         Authctxt *authctxt = ctx;
-        char challenge[1024], *p;
-        int len;
+        char challenge[1024];
         struct skey skey;
 
         if (_compat_skeychallenge(&skey, authctxt->user, challenge,
             sizeof(challenge)) == -1)
                 return -1;
 
-        *name  = xstrdup("");
-        *infotxt  = xstrdup("");
+        *name = xstrdup("");
+        *infotxt = xstrdup("");
         *numprompts = 1;
-        *prompts = xmalloc(*numprompts * sizeof(char *));
-        *echo_on = xmalloc(*numprompts * sizeof(u_int));
-        (*echo_on)[0] = 0;
-
-        len = strlen(challenge) + strlen(SKEY_PROMPT) + 1;
-        p = xmalloc(len);
-        strlcpy(p, challenge, len);
-        strlcat(p, SKEY_PROMPT, len);
-        (*prompts)[0] = p;
+        *prompts = xcalloc(*numprompts, sizeof(char *));
+        *echo_on = xcalloc(*numprompts, sizeof(u_int));
+
+        xasprintf(*prompts, "%s%s", challenge, SKEY_PROMPT);
 
         return 0;
 }