2008-06-21 11:29:25 +00:00
|
|
|
$OpenBSD: patch-conserver_group_c,v 1.3 2008/06/21 11:29:25 sthen Exp $
|
|
|
|
--- conserver/group.c.orig Mon Apr 2 19:18:59 2007
|
|
|
|
+++ conserver/group.c Fri Oct 12 12:03:25 2007
|
|
|
|
@@ -2505,7 +2505,7 @@ TelOpt(o)
|
2005-08-02 07:25:47 +00:00
|
|
|
if (o < sizeof(telopts) / sizeof(char *))
|
|
|
|
return telopts[o];
|
|
|
|
else {
|
|
|
|
- sprintf(opt, "%d", o);
|
|
|
|
+ snprintf(opt, sizeof(opt), "%d", o);
|
|
|
|
return opt;
|
|
|
|
}
|
|
|
|
}
|
2008-06-21 11:29:25 +00:00
|
|
|
@@ -3839,11 +3839,9 @@ DoClientRead(pGE, pCLServing)
|
|
|
|
"failed]\r\n", -1);
|
2003-05-26 20:20:53 +00:00
|
|
|
continue;
|
|
|
|
}
|
2008-06-21 11:29:25 +00:00
|
|
|
- if (TAB3 == (TABDLY & sbuf.c_oflag)) {
|
2003-05-26 20:20:53 +00:00
|
|
|
- sbuf.c_oflag &= ~TABDLY;
|
|
|
|
- sbuf.c_oflag |= TAB0;
|
2008-06-21 11:29:25 +00:00
|
|
|
+ if (TAB3 & sbuf.c_oflag) {
|
|
|
|
+ sbuf.c_oflag &= ~TAB3;
|
2003-05-26 20:20:53 +00:00
|
|
|
} else {
|
|
|
|
- sbuf.c_oflag &= ~TABDLY;
|
2008-06-21 11:29:25 +00:00
|
|
|
sbuf.c_oflag |= TAB3;
|
2003-05-26 20:20:53 +00:00
|
|
|
}
|
|
|
|
if (-1 ==
|