summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:35:09 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:35:09 +1100
commit4fbf08a8f0cf54a2e75cd003a32cf3c04c5642e6 (patch)
tree98fc7215165c1ba03ca4835e8d9bf789fe4f338c
parent73f1074272add17aeaaff10c5ec6ab310e513d9d (diff)
- stevesk@cvs.openbsd.org 2002/01/22 02:52:41
[servconf.c] typo in error message; from djast@cs.toronto.edu
-rw-r--r--ChangeLog5
-rw-r--r--servconf.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6fe6d181e..0ebcb35c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -223,6 +223,9 @@
223 [channels.c nchan.c] 223 [channels.c nchan.c]
224 cleanup channels faster if the are empty and we are in drain-state; 224 cleanup channels faster if the are empty and we are in drain-state;
225 ok deraadt@ 225 ok deraadt@
226 - stevesk@cvs.openbsd.org 2002/01/22 02:52:41
227 [servconf.c]
228 typo in error message; from djast@cs.toronto.edu
226 229
22720020121 23020020121
228 - (djm) Rework ssh-rand-helper: 231 - (djm) Rework ssh-rand-helper:
@@ -7370,4 +7373,4 @@
7370 - Wrote replacements for strlcpy and mkdtemp 7373 - Wrote replacements for strlcpy and mkdtemp
7371 - Released 1.0pre1 7374 - Released 1.0pre1
7372 7375
7373$Id: ChangeLog,v 1.1785 2002/01/22 12:34:52 djm Exp $ 7376$Id: ChangeLog,v 1.1786 2002/01/22 12:35:09 djm Exp $
diff --git a/servconf.c b/servconf.c
index 445d2da79..0cb744a1d 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: servconf.c,v 1.97 2002/01/04 18:14:16 stevesk Exp $"); 13RCSID("$OpenBSD: servconf.c,v 1.98 2002/01/22 02:52:41 stevesk Exp $");
14 14
15#if defined(KRB4) || defined(KRB5) 15#if defined(KRB4) || defined(KRB5)
16#include <krb.h> 16#include <krb.h>
@@ -429,7 +429,7 @@ process_server_config_line(ServerOptions *options, char *line,
429 return 0; 429 return 0;
430 if (options->listen_addrs != NULL) 430 if (options->listen_addrs != NULL)
431 fatal("%s line %d: ports must be specified before " 431 fatal("%s line %d: ports must be specified before "
432 "ListenAdress.", filename, linenum); 432 "ListenAddress.", filename, linenum);
433 if (options->num_ports >= MAX_PORTS) 433 if (options->num_ports >= MAX_PORTS)
434 fatal("%s line %d: too many ports.", 434 fatal("%s line %d: too many ports.",
435 filename, linenum); 435 filename, linenum);