------- Blind-Carbon-Copy

To: openssh@openssh.com
cc: Diego Linke - GAMK <linke@calnet.com.br>
Subject: 3.2.3p1: NetBSD skeychallenge() takes 4 args
From: Jun-ichiro itojun Hagino <itojun@iijlab.net>
Date: Tue, 04 Jun 2002 09:27:48 +0900
Sender: itojun@itojun.org

	about portable openssh.
	on NetBSD, skeychallenge() takes 4 args instead of 3.  you may want
	to add configure.ac fragment and then AC_DEFINE(SKEYCHALLENGE_4ARG)
	or something.

itojun


- --- monitor.c-	Tue Jun  4 09:24:41 2002
+++ monitor.c	Tue Jun  4 09:25:26 2002
@@ -667,7 +667,11 @@
 	char challenge[1024];
 	int res;
 
+#ifdef __NetBSD__
+	res = skeychallenge(&skey, authctxt->user, challenge, sizeof(challenge));
+#else
 	res = skeychallenge(&skey, authctxt->user, challenge);
+#endif
 
 	buffer_clear(m);
 	buffer_put_int(m, res);
- --- auth-skey.c-	Tue Jun  4 09:24:37 2002
+++ auth-skey.c	Tue Jun  4 09:25:14 2002
@@ -47,7 +47,11 @@
 	int len;
 	struct skey skey;
 
+#ifdef __NetBSD__
+	if (skeychallenge(&skey, authctxt->user, challenge, sizeof(challenge)) == -1)
+#else
 	if (skeychallenge(&skey, authctxt->user, challenge) == -1)
+#endif
 		return -1;
 
 	*name       = xstrdup("");

------- End of Blind-Carbon-Copy