diff options
| author | des <des@FreeBSD.org> | 2002-06-29 11:48:59 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-06-29 11:48:59 +0000 |
| commit | 72a8e501f778fe56e3ec3c32d99f77e20b9b24be (patch) | |
| tree | 038040484c6082020b918a9c208a38e77fd09e7d /crypto/openssh/authfd.c | |
| parent | 96f831106bfe6170a73a8112d39a8b123156c6f2 (diff) | |
| download | FreeBSD-src-72a8e501f778fe56e3ec3c32d99f77e20b9b24be.zip FreeBSD-src-72a8e501f778fe56e3ec3c32d99f77e20b9b24be.tar.gz | |
Resolve conflicts.
Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'crypto/openssh/authfd.c')
| -rw-r--r-- | crypto/openssh/authfd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssh/authfd.c b/crypto/openssh/authfd.c index a452a79..1b689ea 100644 --- a/crypto/openssh/authfd.c +++ b/crypto/openssh/authfd.c @@ -35,7 +35,8 @@ */ #include "includes.h" -RCSID("$OpenBSD: authfd.c,v 1.55 2002/06/19 00:27:55 deraadt Exp $"); +RCSID("$OpenBSD: authfd.c,v 1.56 2002/06/25 16:22:42 markus Exp $"); +RCSID("$FreeBSD$"); #include <openssl/evp.h> @@ -144,7 +145,7 @@ ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply error("Error reading response from authentication socket."); return 0; } - buffer_append(reply, (char *) buf, l); + buffer_append(reply, buf, l); len -= l; } return 1; |
