RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2002/06/26 13:49:26 

[session.c]
     disclose less information from environment files; based on input
     from djm, and dschultz@uclink.Berkeley.EDU
This commit is contained in:
Damien Miller 2002-06-26 23:51:06 +10:00
parent 530a754d38
commit 990070a8c5
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -51,6 +51,10 @@
- deraadt@cvs.openbsd.org 2002/06/26 13:20:57 - deraadt@cvs.openbsd.org 2002/06/26 13:20:57
[monitor.c] [monitor.c]
be careful in mm_zalloc be careful in mm_zalloc
- deraadt@cvs.openbsd.org 2002/06/26 13:49:26
[session.c]
disclose less information from environment files; based on input
from djm, and dschultz@uclink.Berkeley.EDU
- (djm) Require krb5 devel for RPM build w/ KrbV - (djm) Require krb5 devel for RPM build w/ KrbV
- (djm) Improve PAMAuthenticationViaKbdInt text from Nalin Dahyabhai - (djm) Improve PAMAuthenticationViaKbdInt text from Nalin Dahyabhai
<nalin@redhat.com> <nalin@redhat.com>
@ -1153,4 +1157,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2296 2002/06/26 13:27:11 djm Exp $ $Id: ChangeLog,v 1.2297 2002/06/26 13:51:06 djm Exp $

8
session.c
View File

@ -33,7 +33,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: session.c,v 1.141 2002/06/26 08:58:26 markus Exp $"); RCSID("$OpenBSD: session.c,v 1.142 2002/06/26 13:49:26 deraadt Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -877,12 +877,15 @@ read_environment_file(char ***env, u_int *envsize,
FILE *f; FILE *f;
char buf[4096]; char buf[4096];
char *cp, *value; char *cp, *value;
u_int lineno = 0;
f = fopen(filename, "r"); f = fopen(filename, "r");
if (!f) if (!f)
return; return;
while (fgets(buf, sizeof(buf), f)) { while (fgets(buf, sizeof(buf), f)) {
if (++lineno > 1000)
fatal("Too many lines in environment file %s", filename);
for (cp = buf; *cp == ' ' || *cp == '\t'; cp++) for (cp = buf; *cp == ' ' || *cp == '\t'; cp++)
; ;
if (!*cp || *cp == '#' || *cp == '\n') if (!*cp || *cp == '#' || *cp == '\n')
@ -891,7 +894,8 @@ read_environment_file(char ***env, u_int *envsize,
*strchr(cp, '\n') = '\0'; *strchr(cp, '\n') = '\0';
value = strchr(cp, '='); value = strchr(cp, '=');
if (value == NULL) { if (value == NULL) {
fprintf(stderr, "Bad line in %.100s: %.200s\n", filename, buf); fprintf(stderr, "Bad line %u in %.100s\n", lineno,
filename);
continue; continue;
} }
/* /*