diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | readconf.c | 4 | ||||
-rw-r--r-- | sshpty.c | 5 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20010806 | ||
2 | - OpenBSD CVS Sync | ||
3 | - markus@cvs.openbsd.org 2001/07/22 21:32:27 | ||
4 | [sshpty.c] | ||
5 | update comment | ||
6 | |||
1 | 20010803 | 7 | 20010803 |
2 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on | 8 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on |
3 | a fast UltraSPARC. | 9 | a fast UltraSPARC. |
@@ -6107,4 +6113,4 @@ | |||
6107 | - Wrote replacements for strlcpy and mkdtemp | 6113 | - Wrote replacements for strlcpy and mkdtemp |
6108 | - Released 1.0pre1 | 6114 | - Released 1.0pre1 |
6109 | 6115 | ||
6110 | $Id: ChangeLog,v 1.1425 2001/08/06 06:51:49 djm Exp $ | 6116 | $Id: ChangeLog,v 1.1426 2001/08/06 20:47:23 mouring Exp $ |
diff --git a/readconf.c b/readconf.c index 4a1094685..19b571a71 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -256,7 +256,8 @@ process_config_line(Options *options, const char *host, | |||
256 | char *line, const char *filename, int linenum, | 256 | char *line, const char *filename, int linenum, |
257 | int *activep) | 257 | int *activep) |
258 | { | 258 | { |
259 | char buf[256], *s, *string, **charptr, *endofnumber, *keyword, *arg; | 259 | char buf[256], *s, *string = NULL, **charptr, *endofnumber, *keyword, |
260 | *arg; | ||
260 | int opcode, *intptr, value; | 261 | int opcode, *intptr, value; |
261 | u_short fwd_port, fwd_host_port; | 262 | u_short fwd_port, fwd_host_port; |
262 | 263 | ||
@@ -469,7 +470,6 @@ parse_string: | |||
469 | 470 | ||
470 | case oProxyCommand: | 471 | case oProxyCommand: |
471 | charptr = &options->proxy_command; | 472 | charptr = &options->proxy_command; |
472 | string = xstrdup(""); | ||
473 | while ((arg = strdelim(&s)) != NULL && *arg != '\0') { | 473 | while ((arg = strdelim(&s)) != NULL && *arg != '\0') { |
474 | string = xrealloc(string, strlen(string) + strlen(arg) + 2); | 474 | string = xrealloc(string, strlen(string) + strlen(arg) + 2); |
475 | strcat(string, " "); | 475 | strcat(string, " "); |
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: sshpty.c,v 1.2 2001/07/18 21:10:43 markus Exp $"); | 15 | RCSID("$OpenBSD: sshpty.c,v 1.3 2001/07/22 21:32:27 markus Exp $"); |
16 | 16 | ||
17 | #ifdef HAVE_UTIL_H | 17 | #ifdef HAVE_UTIL_H |
18 | # include <util.h> | 18 | # include <util.h> |
@@ -313,7 +313,8 @@ pty_setowner(struct passwd *pw, const char *ttyname) | |||
313 | 313 | ||
314 | /* | 314 | /* |
315 | * Change owner and mode of the tty as required. | 315 | * Change owner and mode of the tty as required. |
316 | * Warn but continue if filesystem is read-only and the uids match. | 316 | * Warn but continue if filesystem is read-only and the uids match/ |
317 | * tty is owned by root. | ||
317 | */ | 318 | */ |
318 | if (stat(ttyname, &st)) | 319 | if (stat(ttyname, &st)) |
319 | fatal("stat(%.100s) failed: %.100s", ttyname, | 320 | fatal("stat(%.100s) failed: %.100s", ttyname, |