diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-06-23 16:09:08 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-06-23 16:09:08 +0000 |
| commit | 80628bacb0b4bc1daaef4e038e755602c972bede (patch) | |
| tree | cc93abce4a81ab84afa26d861b756d5c77818afa /crypto/openssh/authfile.c | |
| parent | f191b6f96cdb3270a60bcb6219ce0998bdd25cde (diff) | |
| download | src-80628bacb0b4bc1daaef4e038e755602c972bede.tar.gz src-80628bacb0b4bc1daaef4e038e755602c972bede.zip | |
Resolve conflicts. Known issues:
- sshd fails to set TERM correctly.
- privilege separation may break PAM and is currently turned off.
- man pages have not yet been updated
I will have these issues resolved, and privilege separation turned on by
default, in time for DP2.
Sponsored by: DARPA, NAI Labs
Notes
Notes:
svn path=/head/; revision=98684
Diffstat (limited to 'crypto/openssh/authfile.c')
| -rw-r--r-- | crypto/openssh/authfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/authfile.c b/crypto/openssh/authfile.c index 80b2fc5de33e..6b632299e604 100644 --- a/crypto/openssh/authfile.c +++ b/crypto/openssh/authfile.c @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: authfile.c,v 1.48 2002/02/28 15:46:33 markus Exp $"); +RCSID("$OpenBSD: authfile.c,v 1.49 2002/05/23 19:24:30 markus Exp $"); RCSID("$FreeBSD$"); #include <openssl/err.h> @@ -422,7 +422,7 @@ fail: return NULL; } -static Key * +Key * key_load_private_pem(int fd, int type, const char *passphrase, char **commentp) { |