From 042e2e8cbb19c4c32db58510f4a177a2bd676914 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 8 Jul 2004 23:09:42 +1000 Subject: - dtucker@cvs.openbsd.org 2004/07/03 11:02:25 [monitor_wrap.c] Put s/key functions inside #ifdef SKEY same as monitor.c, from des@freebsd via bz #330, ok markus@ --- ChangeLog | 6 +++++- monitor_wrap.c | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index aebd1f17a..fa8acb155 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ - dtucker@cvs.openbsd.org 2004/07/03 05:11:33 [sshlogin.c] (RCSID sync only, the corresponding code is not in Portable) Use '\0' not 0 for string; ok djm@, deraadt@ + - dtucker@cvs.openbsd.org 2004/07/03 11:02:25 + [monitor_wrap.c] + Put s/key functions inside #ifdef SKEY same as monitor.c, + from des@freebsd via bz #330, ok markus@ 20040702 - (dtucker) [mdoc2man.awk] Teach it to ignore .Bk -words, reported by @@ -1487,4 +1491,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3469 2004/07/08 13:08:26 dtucker Exp $ +$Id: ChangeLog,v 1.3470 2004/07/08 13:09:42 dtucker Exp $ diff --git a/monitor_wrap.c b/monitor_wrap.c index 0f5ecaaee..f6bc34ec8 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -25,7 +25,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor_wrap.c,v 1.37 2004/06/22 05:05:45 dtucker Exp $"); +RCSID("$OpenBSD: monitor_wrap.c,v 1.38 2004/07/03 11:02:25 dtucker Exp $"); #include #include @@ -914,6 +914,7 @@ mm_bsdauth_respond(void *ctx, u_int numresponses, char **responses) return ((authok == 0) ? -1 : 0); } +#ifdef SKEY int mm_skey_query(void *ctx, char **name, char **infotxt, u_int *numprompts, char ***prompts, u_int **echo_on) @@ -977,6 +978,7 @@ mm_skey_respond(void *ctx, u_int numresponses, char **responses) return ((authok == 0) ? -1 : 0); } +#endif /* SKEY */ void mm_ssh1_session_id(u_char session_id[16]) -- cgit v1.2.3