tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/11/12 11:17:07 

[servconf.c]
     enable authorized_keys2 again. tested by fries@
This commit is contained in:
Damien Miller 2001-11-14 00:03:14 +11:00
parent 61b05cfdda
commit 527366ccba
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -10,6 +10,9 @@
[auth-krb5.c] [auth-krb5.c]
fix krb5 authorization check. found by <jhawk@MIT.EDU>. from fix krb5 authorization check. found by <jhawk@MIT.EDU>. from
art@, deraadt@ ok art@, deraadt@ ok
- markus@cvs.openbsd.org 2001/11/12 11:17:07
[servconf.c]
enable authorized_keys2 again. tested by fries@
20011112 20011112
- (djm) Makefile correctness fix from Mark D. Baushke <mdb@juniper.net> - (djm) Makefile correctness fix from Mark D. Baushke <mdb@juniper.net>
@ -6900,4 +6903,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1660 2001/11/13 13:02:10 djm Exp $ $Id: ChangeLog,v 1.1661 2001/11/13 13:03:14 djm Exp $

4
servconf.c
View File

@ -10,7 +10,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: servconf.c,v 1.90 2001/11/11 13:02:31 markus Exp $"); RCSID("$OpenBSD: servconf.c,v 1.91 2001/11/12 18:17:07 markus Exp $");
#if defined(KRB4) || defined(KRB5) #if defined(KRB4) || defined(KRB5)
#include <krb.h> #include <krb.h>
@ -220,8 +220,6 @@ fill_default_server_options(ServerOptions *options)
options->client_alive_interval = 0; options->client_alive_interval = 0;
if (options->client_alive_count_max == -1) if (options->client_alive_count_max == -1)
options->client_alive_count_max = 3; options->client_alive_count_max = 3;
if (options->authorized_keys_file == NULL)
options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS;
if (options->authorized_keys_file2 == NULL) { if (options->authorized_keys_file2 == NULL) {
/* authorized_keys_file2 falls back to authorized_keys_file */ /* authorized_keys_file2 falls back to authorized_keys_file */
if (options->authorized_keys_file != NULL) if (options->authorized_keys_file != NULL)