mirror of git://anongit.mindrot.org/openssh.git
parent
2ab5924d1f
commit
c88785efc8
|
@ -1,3 +1,9 @@
|
||||||
|
20010806
|
||||||
|
- OpenBSD CVS Sync
|
||||||
|
- markus@cvs.openbsd.org 2001/07/22 21:32:27
|
||||||
|
[sshpty.c]
|
||||||
|
update comment
|
||||||
|
|
||||||
20010803
|
20010803
|
||||||
- (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
|
- (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
|
||||||
a fast UltraSPARC.
|
a fast UltraSPARC.
|
||||||
|
@ -6107,4 +6113,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.1425 2001/08/06 06:51:49 djm Exp $
|
$Id: ChangeLog,v 1.1426 2001/08/06 20:47:23 mouring Exp $
|
||||||
|
|
|
@ -256,7 +256,8 @@ process_config_line(Options *options, const char *host,
|
||||||
char *line, const char *filename, int linenum,
|
char *line, const char *filename, int linenum,
|
||||||
int *activep)
|
int *activep)
|
||||||
{
|
{
|
||||||
char buf[256], *s, *string, **charptr, *endofnumber, *keyword, *arg;
|
char buf[256], *s, *string = NULL, **charptr, *endofnumber, *keyword,
|
||||||
|
*arg;
|
||||||
int opcode, *intptr, value;
|
int opcode, *intptr, value;
|
||||||
u_short fwd_port, fwd_host_port;
|
u_short fwd_port, fwd_host_port;
|
||||||
|
|
||||||
|
@ -469,7 +470,6 @@ parse_string:
|
||||||
|
|
||||||
case oProxyCommand:
|
case oProxyCommand:
|
||||||
charptr = &options->proxy_command;
|
charptr = &options->proxy_command;
|
||||||
string = xstrdup("");
|
|
||||||
while ((arg = strdelim(&s)) != NULL && *arg != '\0') {
|
while ((arg = strdelim(&s)) != NULL && *arg != '\0') {
|
||||||
string = xrealloc(string, strlen(string) + strlen(arg) + 2);
|
string = xrealloc(string, strlen(string) + strlen(arg) + 2);
|
||||||
strcat(string, " ");
|
strcat(string, " ");
|
||||||
|
|
5
sshpty.c
5
sshpty.c
|
@ -12,7 +12,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: sshpty.c,v 1.2 2001/07/18 21:10:43 markus Exp $");
|
RCSID("$OpenBSD: sshpty.c,v 1.3 2001/07/22 21:32:27 markus Exp $");
|
||||||
|
|
||||||
#ifdef HAVE_UTIL_H
|
#ifdef HAVE_UTIL_H
|
||||||
# include <util.h>
|
# include <util.h>
|
||||||
|
@ -313,7 +313,8 @@ pty_setowner(struct passwd *pw, const char *ttyname)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Change owner and mode of the tty as required.
|
* Change owner and mode of the tty as required.
|
||||||
* Warn but continue if filesystem is read-only and the uids match.
|
* Warn but continue if filesystem is read-only and the uids match/
|
||||||
|
* tty is owned by root.
|
||||||
*/
|
*/
|
||||||
if (stat(ttyname, &st))
|
if (stat(ttyname, &st))
|
||||||
fatal("stat(%.100s) failed: %.100s", ttyname,
|
fatal("stat(%.100s) failed: %.100s", ttyname,
|
||||||
|
|
Loading…
Reference in New Issue