diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | monitor_wrap.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -3,6 +3,10 @@ | |||
3 | - dtucker@cvs.openbsd.org 2004/07/03 05:11:33 | 3 | - dtucker@cvs.openbsd.org 2004/07/03 05:11:33 |
4 | [sshlogin.c] (RCSID sync only, the corresponding code is not in Portable) | 4 | [sshlogin.c] (RCSID sync only, the corresponding code is not in Portable) |
5 | Use '\0' not 0 for string; ok djm@, deraadt@ | 5 | Use '\0' not 0 for string; ok djm@, deraadt@ |
6 | - dtucker@cvs.openbsd.org 2004/07/03 11:02:25 | ||
7 | [monitor_wrap.c] | ||
8 | Put s/key functions inside #ifdef SKEY same as monitor.c, | ||
9 | from des@freebsd via bz #330, ok markus@ | ||
6 | 10 | ||
7 | 20040702 | 11 | 20040702 |
8 | - (dtucker) [mdoc2man.awk] Teach it to ignore .Bk -words, reported by | 12 | - (dtucker) [mdoc2man.awk] Teach it to ignore .Bk -words, reported by |
@@ -1487,4 +1491,4 @@ | |||
1487 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1491 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1488 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1492 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1489 | 1493 | ||
1490 | $Id: ChangeLog,v 1.3469 2004/07/08 13:08:26 dtucker Exp $ | 1494 | $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 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.37 2004/06/22 05:05:45 dtucker Exp $"); | 28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.38 2004/07/03 11:02:25 dtucker Exp $"); |
29 | 29 | ||
30 | #include <openssl/bn.h> | 30 | #include <openssl/bn.h> |
31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
@@ -914,6 +914,7 @@ mm_bsdauth_respond(void *ctx, u_int numresponses, char **responses) | |||
914 | return ((authok == 0) ? -1 : 0); | 914 | return ((authok == 0) ? -1 : 0); |
915 | } | 915 | } |
916 | 916 | ||
917 | #ifdef SKEY | ||
917 | int | 918 | int |
918 | mm_skey_query(void *ctx, char **name, char **infotxt, | 919 | mm_skey_query(void *ctx, char **name, char **infotxt, |
919 | u_int *numprompts, char ***prompts, u_int **echo_on) | 920 | u_int *numprompts, char ***prompts, u_int **echo_on) |
@@ -977,6 +978,7 @@ mm_skey_respond(void *ctx, u_int numresponses, char **responses) | |||
977 | 978 | ||
978 | return ((authok == 0) ? -1 : 0); | 979 | return ((authok == 0) ? -1 : 0); |
979 | } | 980 | } |
981 | #endif /* SKEY */ | ||
980 | 982 | ||
981 | void | 983 | void |
982 | mm_ssh1_session_id(u_char session_id[16]) | 984 | mm_ssh1_session_id(u_char session_id[16]) |