summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--servconf.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b64310628..3c799fbaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,10 @@
32 - stevesk@cvs.openbsd.org 2009/04/14 16:33:42 32 - stevesk@cvs.openbsd.org 2009/04/14 16:33:42
33 [sftp-server.c] 33 [sftp-server.c]
34 remove unused option character from getopt() optstring; ok markus@ 34 remove unused option character from getopt() optstring; ok markus@
35 - jj@cvs.openbsd.org 2009/04/14 21:10:54
36 [servconf.c]
37 Fixed a few the-the misspellings in comments. Skipped a bunch in
38 binutils,gcc and so on. ok jmc@
35 39
3620090616 4020090616
37 - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t 41 - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
diff --git a/servconf.c b/servconf.c
index e7fc2a781..af940cac2 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.c,v 1.194 2009/01/22 10:02:34 djm Exp $ */ 1/* $OpenBSD: servconf.c,v 1.195 2009/04/14 21:10:54 jj Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -1376,7 +1376,7 @@ parse_server_match_config(ServerOptions *options, const char *user,
1376/* 1376/*
1377 * Copy any supported values that are set. 1377 * Copy any supported values that are set.
1378 * 1378 *
1379 * If the preauth flag is set, we do not bother copying the the string or 1379 * If the preauth flag is set, we do not bother copying the string or
1380 * array values that are not used pre-authentication, because any that we 1380 * array values that are not used pre-authentication, because any that we
1381 * do use must be explictly sent in mm_getpwnamallow(). 1381 * do use must be explictly sent in mm_getpwnamallow().
1382 */ 1382 */