- (djm) OpenBSD CVS updates:

- markus@cvs.openbsd.org 2000/06/26 03:22:29 [authfd.c] cleanup, less cut&paste - markus@cvs.openbsd.org 2000/06/26 15:59:19 [servconf.c servconf.h session.c sshd.8 sshd.c] MaxStartups: limit number of unauthenticated connections, work by theo and me - deraadt@cvs.openbsd.org 2000/07/05 14:18:07 [session.c] use no_x11_forwarding_flag correctly; provos ok - provos@cvs.openbsd.org 2000/07/05 15:35:57 [sshd.c] typo - aaron@cvs.openbsd.org 2000/07/05 22:06:58 [scp.1 ssh-agent.1 ssh-keygen.1 sshd.8] Insert more missing .El directives. Our troff really should identify these and spit out a warning. - todd@cvs.openbsd.org 2000/07/06 21:55:04 [auth-rsa.c auth2.c ssh-keygen.c] clean code is good code - deraadt@cvs.openbsd.org 2000/07/07 02:14:29 [serverloop.c] sense of port forwarding flag test was backwards - provos@cvs.openbsd.org 2000/07/08 17:17:31 [compat.c readconf.c] replace strtok with strsep; from David Young <dyoung@onthejob.net> - deraadt@cvs.openbsd.org 2000/07/08 19:21:15 [auth.h] KNF - ho@cvs.openbsd.org 2000/07/08 19:27:33 [compat.c readconf.c] Better conditions for strsep() ending. - ho@cvs.openbsd.org 2000/07/10 10:27:05 [readconf.c] Get the correct message on errors. (niels@ ok) - ho@cvs.openbsd.org 2000/07/10 10:30:25 [cipher.c kex.c servconf.c] strtok() --> strsep(). (niels@ ok)
author: Damien Miller <djm@mindrot.org> 2000-07-11 17:31:38 +1000
committer: Damien Miller <djm@mindrot.org> 2000-07-11 17:31:38 +1000
commit: 3702396526a2569402696ff7d7c6d0fe2e5a447b (patch)
tree: 3ab056c59cd0c732ec179bd91be88d4e05b087fa /compat.c
parent: bc33bd44a2ef165dea1d974fc2d80b822ae08c2a (diff)
1 files changed, 4 insertions, 4 deletions
diff --git a/compat.c b/compat.c
index e3410d497..595a0a378 100644
--- a/compat.c
+++ b/compat.c
@@ -28,7 +28,7 @@
 */
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.17 2000/06/20 01:39:40 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.19 2000/07/09 01:27:32 ho Exp $");
 #include "ssh.h"
 #include "packet.h"
@@ -81,13 +81,13 @@ compat_datafellows(const char *version)
 int
 proto_spec(const char *spec)
 {
-        char *s, *p;
+        char *s, *p, *q;
        int ret = SSH_PROTO_UNKNOWN;
        if (spec == NULL)
                return ret;
-        s = xstrdup(spec);
+        q = s = xstrdup(spec);
-        for ((p = strtok(s, SEP)); p; (p = strtok(NULL, SEP))) {
+        for ((p = strsep(&q, SEP)); p && *p != '\0'; (p = strsep(&q, SEP))) {
                switch(atoi(p)) {
                case 1:
                        if (ret == SSH_PROTO_UNKNOWN)
author	Damien Miller <djm@mindrot.org>	2000-07-11 17:31:38 +1000
committer	Damien Miller <djm@mindrot.org>	2000-07-11 17:31:38 +1000
commit	3702396526a2569402696ff7d7c6d0fe2e5a447b (patch)
tree	3ab056c59cd0c732ec179bd91be88d4e05b087fa /compat.c
parent	bc33bd44a2ef165dea1d974fc2d80b822ae08c2a (diff)

diff --git a/compat.c b/compat.c index e3410d497..595a0a378 100644 --- a/compat.c +++ b/compat.c
@@ -28,7 +28,7 @@
28	*/	28	*/
29		29
30	#include "includes.h"	30	#include "includes.h"
31	RCSID("$OpenBSD: compat.c,v 1.17 2000/06/20 01:39:40 markus Exp $");	31	RCSID("$OpenBSD: compat.c,v 1.19 2000/07/09 01:27:32 ho Exp $");
32		32
33	#include "ssh.h"	33	#include "ssh.h"
34	#include "packet.h"	34	#include "packet.h"
@@ -81,13 +81,13 @@ compat_datafellows(const char *version)
81	int	81	int
82	proto_spec(const char *spec)	82	proto_spec(const char *spec)
83	{	83	{
84	char s, p;	84	char s, p, *q;
85	int ret = SSH_PROTO_UNKNOWN;	85	int ret = SSH_PROTO_UNKNOWN;
86		86
87	if (spec == NULL)	87	if (spec == NULL)
88	return ret;	88	return ret;
89	s = xstrdup(spec);	89	q = s = xstrdup(spec);
90	for ((p = strtok(s, SEP)); p; (p = strtok(NULL, SEP))) {	90	for ((p = strsep(&q, SEP)); p && *p != '\0'; (p = strsep(&q, SEP))) {
91	switch(atoi(p)) {	91	switch(atoi(p)) {
92	case 1:	92	case 1:
93	if (ret == SSH_PROTO_UNKNOWN)	93	if (ret == SSH_PROTO_UNKNOWN)