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

This commit is contained in:

Dag-Erling Smørgrav

2002-06-23 16:09:08 +00:00

parent f191b6f96c

commit 80628bacb0

45 changed files with 2060 additions and 1425 deletions

									
										crypto/openssh/authfile.c
									
		+2
		-2
	
												View File
												
				@@ -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 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase,

					return NULL;

				}

				static Key *

				Key *

				key_load_private_pem(int fd, int type, const char *passphrase,

				    char **commentp)

				{