summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-05-15 16:14:36 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-05-15 16:14:36 +0000
commit58d4dafeb1159cebd03a2b32cb87a1970606a441 (patch)
tree98086be8df1eb71b2ab80b2ce335adb78c163f27
parent966bfdae6bbe4ce2d57e381715e39109bb3f0d79 (diff)
- itojun@cvs.openbsd.org 2002/05/13 02:37:39
[auth-skey.c auth2.c] less warnings. skey_{respond,query} are public (in auth.h)
-rw-r--r--ChangeLog5
-rw-r--r--auth-skey.c6
-rw-r--r--auth2.c3
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 211e248f..3247f958 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
- stevesk@cvs.openbsd.org 2002/05/11 20:24:48
[ssh.h]
typo in comment
+ - itojun@cvs.openbsd.org 2002/05/13 02:37:39
+ [auth-skey.c auth2.c]
+ less warnings. skey_{respond,query} are public (in auth.h)
20020514
- (stevesk) [README.privsep] PAM+privsep works with Solaris 8.
@@ -614,4 +617,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2124 2002/05/15 16:09:57 mouring Exp $
+$Id: ChangeLog,v 1.2125 2002/05/15 16:14:36 mouring Exp $
diff --git a/auth-skey.c b/auth-skey.c
index e897d187..b6455044 100644
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -22,7 +22,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
-RCSID("$OpenBSD: auth-skey.c,v 1.17 2002/03/18 17:50:31 provos Exp $");
+RCSID("$OpenBSD: auth-skey.c,v 1.18 2002/05/13 02:37:39 itojun Exp $");
#ifdef SKEY
@@ -38,7 +38,7 @@ skey_init_ctx(Authctxt *authctxt)
return authctxt;
}
-static int
+int
skey_query(void *ctx, char **name, char **infotxt,
u_int* numprompts, char ***prompts, u_int **echo_on)
{
@@ -66,7 +66,7 @@ skey_query(void *ctx, char **name, char **infotxt,
return 0;
}
-static int
+int
skey_respond(void *ctx, u_int numresponses, char **responses)
{
Authctxt *authctxt = ctx;
diff --git a/auth2.c b/auth2.c
index 20584caa..6bcc5652 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.90 2002/05/12 23:53:45 djm Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.91 2002/05/13 02:37:39 itojun Exp $");
#include <openssl/evp.h>
@@ -51,6 +51,7 @@ RCSID("$OpenBSD: auth2.c,v 1.90 2002/05/12 23:53:45 djm Exp $");
#include "canohost.h"
#include "match.h"
#include "monitor_wrap.h"
+#include "atomicio.h"
/* import */
extern ServerOptions options;