summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--readconf.c5
-rw-r--r--servconf.c5
3 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 35455ed06..a9e993d46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - stevesk@cvs.openbsd.org 2001/04/02 14:15:31 3 - stevesk@cvs.openbsd.org 2001/04/02 14:15:31
4 [sshd.8] 4 [sshd.8]
5 typo; ok markus@ 5 typo; ok markus@
6 - stevesk@cvs.openbsd.org 2001/04/02 14:20:23
7 [readconf.c servconf.c]
8 correct comment; ok markus@
6 9
720010402 1020010402
8 - (stevesk) log.c openbsd sync; missing newlines 11 - (stevesk) log.c openbsd sync; missing newlines
@@ -4802,4 +4805,4 @@
4802 - Wrote replacements for strlcpy and mkdtemp 4805 - Wrote replacements for strlcpy and mkdtemp
4803 - Released 1.0pre1 4806 - Released 1.0pre1
4804 4807
4805$Id: ChangeLog,v 1.1045 2001/04/02 18:18:21 mouring Exp $ 4808$Id: ChangeLog,v 1.1046 2001/04/02 18:20:03 mouring Exp $
diff --git a/readconf.c b/readconf.c
index bb2f2c0e0..365f67eb0 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: readconf.c,v 1.69 2001/03/20 19:10:16 markus Exp $"); 15RCSID("$OpenBSD: readconf.c,v 1.70 2001/04/02 14:20:23 stevesk Exp $");
16 16
17#include "ssh.h" 17#include "ssh.h"
18#include "xmalloc.h" 18#include "xmalloc.h"
@@ -219,8 +219,7 @@ add_remote_forward(Options *options, u_short port, const char *host,
219} 219}
220 220
221/* 221/*
222 * Returns the number of the token pointed to by cp of length len. Never 222 * Returns the number of the token pointed to by cp or oBadOption.
223 * returns if the token is not known.
224 */ 223 */
225 224
226static OpCodes 225static OpCodes
diff --git a/servconf.c b/servconf.c
index 681878615..8094d34ca 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.72 2001/03/25 13:16:10 stevesk Exp $"); 13RCSID("$OpenBSD: servconf.c,v 1.73 2001/04/02 14:20:23 stevesk Exp $");
14 14
15#ifdef KRB4 15#ifdef KRB4
16#include <krb.h> 16#include <krb.h>
@@ -284,8 +284,7 @@ static struct {
284}; 284};
285 285
286/* 286/*
287 * Returns the number of the token pointed to by cp of length len. Never 287 * Returns the number of the token pointed to by cp or sBadOption.
288 * returns if the token is not known.
289 */ 288 */
290 289
291static ServerOpCodes 290static ServerOpCodes