1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
|
Apply by doing:
cd /usr/src
patch -p0 < 014_telnet.patch
Then rebuild and install telnet:
cd usr.bin/telnet
make obj
make depend
make
make install
Index: usr.bin/telnet/authenc.c
===================================================================
RCS file: /cvs/src/usr.bin/telnet/authenc.c,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -p -r1.6 -r1.6.6.1
--- usr.bin/telnet/authenc.c 3 Jun 2003 02:56:18 -0000 1.6
+++ usr.bin/telnet/authenc.c 29 Mar 2005 19:49:10 -0000 1.6.6.1
@@ -80,7 +80,7 @@ telnet_spin()
telnet_getenv(val)
const char *val;
{
- return((char *)env_getvalue((unsigned char *)val));
+ return((char *)env_getvalue((unsigned char *)val, 0));
}
char *
Index: usr.bin/telnet/commands.c
===================================================================
RCS file: /cvs/src/usr.bin/telnet/commands.c,v
retrieving revision 1.46
retrieving revision 1.46.4.1
diff -u -p -r1.46 -r1.46.4.1
--- usr.bin/telnet/commands.c 28 Dec 2003 21:53:01 -0000 1.46
+++ usr.bin/telnet/commands.c 29 Mar 2005 19:49:10 -0000 1.46.4.1
@@ -1821,12 +1821,13 @@ env_default(init, welldefined)
}
unsigned char *
-env_getvalue(var)
+env_getvalue(var, exported_only)
unsigned char *var;
+ int exported_only;
{
struct env_lst *ep;
- if ((ep = env_find(var)))
+ if ((ep = env_find(var)) && (!exported_only || ep->export))
return(ep->value);
return(NULL);
}
Index: usr.bin/telnet/externs.h
===================================================================
RCS file: /cvs/src/usr.bin/telnet/externs.h,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -p -r1.13 -r1.13.4.1
--- usr.bin/telnet/externs.h 3 Jan 2004 23:36:14 -0000 1.13
+++ usr.bin/telnet/externs.h 29 Mar 2005 19:49:10 -0000 1.13.4.1
@@ -204,7 +204,7 @@ void env_unexport (unsigned char *);
void env_send (unsigned char *);
void env_list (void);
unsigned char * env_default(int init, int welldefined);
-unsigned char * env_getvalue(unsigned char *var);
+unsigned char * env_getvalue(unsigned char *var, int exported_only);
void set_escape_char(char *s);
unsigned long sourceroute(char *arg, char **cpp, int *lenp);
@@ -336,7 +336,7 @@ void env_opt_add (unsigned char *);
void env_opt_end (int);
unsigned char *env_default (int, int);
-unsigned char *env_getvalue (unsigned char *);
+unsigned char *env_getvalue (unsigned char *, int);
int get_status (void);
int dosynch (void);
Index: usr.bin/telnet/telnet.c
===================================================================
RCS file: /cvs/src/usr.bin/telnet/telnet.c,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -u -p -r1.18 -r1.18.4.1
--- usr.bin/telnet/telnet.c 8 Nov 2003 19:17:29 -0000 1.18
+++ usr.bin/telnet/telnet.c 29 Mar 2005 19:49:10 -0000 1.18.4.1
@@ -446,7 +446,7 @@ dooption(option)
#endif
case TELOPT_XDISPLOC: /* X Display location */
- if (env_getvalue((unsigned char *)"DISPLAY"))
+ if (env_getvalue((unsigned char *)"DISPLAY", 0))
new_state_ok = 1;
break;
@@ -682,7 +682,7 @@ gettermname()
resettermname = 0;
if (tnamep && tnamep != unknown)
free(tnamep);
- if ((tname = (char *)env_getvalue((unsigned char *)"TERM")) &&
+ if ((tname = (char *)env_getvalue((unsigned char *)"TERM", 0)) &&
(setupterm(tname, 1, &errret) == OK)) {
tnamep = mklist(ttytype, tname);
} else {
@@ -859,7 +859,7 @@ suboption()
unsigned char temp[50], *dp;
int len;
- if ((dp = env_getvalue((unsigned char *)"DISPLAY")) == NULL) {
+ if ((dp = env_getvalue((unsigned char *)"DISPLAY", 0)) == NULL) {
/*
* Something happened, we no longer have a DISPLAY
* variable. So, turn off the option.
@@ -1331,17 +1331,25 @@ slc_check()
}
-unsigned char slc_reply[128];
-unsigned char *slc_replyp;
+static unsigned char slc_reply[2 * SUBBUFSIZE];
+static unsigned char *slc_replyp;
+
+ unsigned char
+slc_add(unsigned char ch)
+{
+ if (slc_replyp == slc_reply + sizeof(slc_reply))
+ return ch;
+ return *slc_replyp++ = ch;
+}
void
slc_start_reply()
{
slc_replyp = slc_reply;
- *slc_replyp++ = IAC;
- *slc_replyp++ = SB;
- *slc_replyp++ = TELOPT_LINEMODE;
- *slc_replyp++ = LM_SLC;
+ slc_add(IAC);
+ slc_add(SB);
+ slc_add(TELOPT_LINEMODE);
+ slc_add(LM_SLC);
}
void
@@ -1350,12 +1358,16 @@ slc_add_reply(func, flags, value)
unsigned char flags;
cc_t value;
{
- if ((*slc_replyp++ = func) == IAC)
- *slc_replyp++ = IAC;
- if ((*slc_replyp++ = flags) == IAC)
- *slc_replyp++ = IAC;
- if ((*slc_replyp++ = (unsigned char)value) == IAC)
- *slc_replyp++ = IAC;
+ if (slc_replyp + 6 >= slc_reply + sizeof(slc_reply)) {
+ printf("slc_add_reply: not enough room\n");
+ return;
+ }
+ if (slc_add(func) == IAC)
+ slc_add(IAC);
+ if (slc_add(flags) == IAC)
+ slc_add(IAC);
+ if (slc_add((unsigned char)value) == IAC)
+ slc_add(IAC);
}
void
@@ -1363,8 +1375,13 @@ slc_end_reply()
{
int len;
- *slc_replyp++ = IAC;
- *slc_replyp++ = SE;
+ if (slc_replyp + 2 >= slc_reply + sizeof(slc_reply)) {
+ printf("slc_end_reply: not enough room\n");
+ return;
+ }
+
+ slc_add(IAC);
+ slc_add(SE);
len = slc_replyp - slc_reply;
if (len <= 6)
return;
@@ -1482,12 +1499,19 @@ env_opt(buf, len)
}
}
-#define OPT_REPLY_SIZE 256
-unsigned char *opt_reply;
-unsigned char *opt_replyp;
-unsigned char *opt_replyend;
+#define OPT_REPLY_SIZE (2 * SUBBUFSIZE)
+static unsigned char *opt_reply;
+static unsigned char *opt_replyp;
+static unsigned char *opt_replyend;
void
+opt_add(unsigned char ch)
+{
+ if (opt_replyp == opt_replyend)
+ return;
+ *opt_replyp++ = ch;
+}
+ void
env_opt_start()
{
unsigned char *p;
@@ -1506,10 +1530,10 @@ env_opt_start()
}
opt_replyp = opt_reply;
opt_replyend = opt_reply + OPT_REPLY_SIZE;
- *opt_replyp++ = IAC;
- *opt_replyp++ = SB;
- *opt_replyp++ = telopt_environ;
- *opt_replyp++ = TELQUAL_IS;
+ opt_add(IAC);
+ opt_add(SB);
+ opt_add(telopt_environ);
+ opt_add(TELQUAL_IS);
}
void
@@ -1541,57 +1565,60 @@ env_opt_add(ep)
env_opt_add(ep);
return;
}
- vp = env_getvalue(ep);
- if (opt_replyp + (vp ? strlen((char *)vp) : 0) +
- strlen((char *)ep) + 6 > opt_replyend)
+ vp = env_getvalue(ep, 1);
+ if (opt_replyp + 2 * (vp ? strlen((char *)vp) : 0) +
+ 2 * strlen((char *)ep) + 6 > opt_replyend)
{
- int len;
+ size_t len;
unsigned char *p;
- opt_replyend += OPT_REPLY_SIZE;
+
len = opt_replyend - opt_reply;
+ len += OPT_REPLY_SIZE + 2 * strlen(ep);
+ if (vp)
+ len += 2 * strlen(vp);
p = (unsigned char *)realloc(opt_reply, len);
- if (p == NULL)
+ if (p == NULL) {
free(opt_reply);
- opt_reply = p;
- if (opt_reply == NULL) {
/*@*/ printf("env_opt_add: realloc() failed!!!\n");
opt_reply = opt_replyp = opt_replyend = NULL;
return;
}
- opt_replyp = opt_reply + len - (opt_replyend - opt_replyp);
- opt_replyend = opt_reply + len;
+ opt_replyp = p + (opt_replyp - opt_reply);
+ opt_replyend = p + len;
+ opt_reply = p;
}
if (opt_welldefined((char *)ep))
#ifdef OLD_ENVIRON
if (telopt_environ == TELOPT_OLD_ENVIRON)
- *opt_replyp++ = old_env_var;
+ opt_add(old_env_var);
else
#endif
- *opt_replyp++ = NEW_ENV_VAR;
+ opt_add(NEW_ENV_VAR);
else
- *opt_replyp++ = ENV_USERVAR;
+ opt_add(ENV_USERVAR);
+
for (;;) {
while ((c = *ep++)) {
switch(c&0xff) {
case IAC:
- *opt_replyp++ = IAC;
+ opt_add(IAC);
break;
case NEW_ENV_VAR:
case NEW_ENV_VALUE:
case ENV_ESC:
case ENV_USERVAR:
- *opt_replyp++ = ENV_ESC;
+ opt_add(ENV_ESC);
break;
}
- *opt_replyp++ = c;
+ opt_add(c);
}
if ((ep = vp)) {
#ifdef OLD_ENVIRON
if (telopt_environ == TELOPT_OLD_ENVIRON)
- *opt_replyp++ = old_env_value;
+ opt_add(old_env_value);
else
#endif
- *opt_replyp++ = NEW_ENV_VALUE;
+ opt_add(NEW_ENV_VALUE);
vp = NULL;
} else
break;
@@ -1619,8 +1646,8 @@ env_opt_end(emptyok)
len = opt_replyp - opt_reply + 2;
if (emptyok || len > 6) {
- *opt_replyp++ = IAC;
- *opt_replyp++ = SE;
+ opt_add(IAC);
+ opt_add(SE);
if (NETROOM() > len) {
ring_supply_data(&netoring, opt_reply, len);
printsub('>', &opt_reply[2], len - 2);
@@ -2197,7 +2224,7 @@ telnet(user)
send_will(TELOPT_LINEMODE, 1);
send_will(TELOPT_NEW_ENVIRON, 1);
send_do(TELOPT_STATUS, 1);
- if (env_getvalue((unsigned char *)"DISPLAY"))
+ if (env_getvalue((unsigned char *)"DISPLAY", 0))
send_will(TELOPT_XDISPLOC, 1);
if (binary)
tel_enter_binary(binary);
|
