diff options
| author | Damien Miller <djm@mindrot.org> | 2000-10-28 14:19:58 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-10-28 14:19:58 +1100 |
| commit | 69b69aa50d0effadc8b7e9c564f7a2ee223ac6b5 (patch) | |
| tree | 4aea8b2b116123812ade69ae73fde80fee8e0f41 /auth-skey.c | |
| parent | c05e01875bab590584f51bbeb464dd23c64f27fa (diff) | |
- (djm) Sync with OpenBSD:
- markus@cvs.openbsd.org 2000/10/16 15:46:32
[ssh.1]
fixes from pekkas@netcore.fi
- markus@cvs.openbsd.org 2000/10/17 14:28:11
[atomicio.c]
return number of characters processed; ok deraadt@
- markus@cvs.openbsd.org 2000/10/18 12:04:02
[atomicio.c]
undo
- markus@cvs.openbsd.org 2000/10/18 12:23:02
[scp.c]
replace atomicio(read,...) with read(); ok deraadt@
- markus@cvs.openbsd.org 2000/10/18 12:42:00
[session.c]
restore old record login behaviour
- deraadt@cvs.openbsd.org 2000/10/19 10:41:13
[auth-skey.c]
fmt string problem in unused code
- provos@cvs.openbsd.org 2000/10/19 10:45:16
[sshconnect2.c]
don't reference freed memory. okay deraadt@
- markus@cvs.openbsd.org 2000/10/21 11:04:23
[canohost.c]
typo, eramore@era-t.ericsson.se; ok niels@
- markus@cvs.openbsd.org 2000/10/23 13:31:55
[cipher.c]
non-alignment dependent swap_bytes(); from
simonb@wasabisystems.com/netbsd
- markus@cvs.openbsd.org 2000/10/26 12:38:28
[compat.c]
add older vandyke products
- markus@cvs.openbsd.org 2000/10/27 01:32:19
[channels.c channels.h clientloop.c serverloop.c session.c]
[ssh.c util.c]
enable non-blocking IO on channels, and tty's (except for the
client ttys).
- markus@cvs.openbsd.org 2000/10/27 01:48:22
channels.c channels.h clientloop.c
deny agent/x11 forwarding unless requested; thanks to jwl@pobox.com
Diffstat (limited to 'auth-skey.c')
| -rw-r--r-- | auth-skey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/auth-skey.c b/auth-skey.c index 1e3cec860..7088b790c 100644 --- a/auth-skey.c +++ b/auth-skey.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include "includes.h" | 25 | #include "includes.h" |
| 26 | RCSID("$OpenBSD: auth-skey.c,v 1.8 2000/09/07 20:27:49 deraadt Exp $"); | 26 | RCSID("$OpenBSD: auth-skey.c,v 1.9 2000/10/19 16:41:13 deraadt Exp $"); |
| 27 | 27 | ||
| 28 | #ifdef SKEY | 28 | #ifdef SKEY |
| 29 | #include "ssh.h" | 29 | #include "ssh.h" |
| @@ -48,7 +48,7 @@ auth_skey_password(struct passwd * pw, const char *password) | |||
| 48 | skeyinfo = skey_fake_keyinfo(pw->pw_name); | 48 | skeyinfo = skey_fake_keyinfo(pw->pw_name); |
| 49 | } | 49 | } |
| 50 | if (skeyinfo != NULL) | 50 | if (skeyinfo != NULL) |
| 51 | packet_send_debug(skeyinfo); | 51 | packet_send_debug("%s", skeyinfo); |
| 52 | /* Try again. */ | 52 | /* Try again. */ |
| 53 | return 0; | 53 | return 0; |
| 54 | } else if (skey_haskey(pw->pw_name) == 0 && | 54 | } else if (skey_haskey(pw->pw_name) == 0 && |