$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)
     if (o < sizeof(telopts) / sizeof(char *))
 	return telopts[o];
     else {
-	sprintf(opt, "%d", o);
+	snprintf(opt, sizeof(opt), "%d", o);
 	return opt;
     }
 }
@@ -3839,11 +3839,9 @@ DoClientRead(pGE, pCLServing)
 					      "failed]\r\n", -1);
 				    continue;
 				}
-				if (TAB3 == (TABDLY & sbuf.c_oflag)) {
-				    sbuf.c_oflag &= ~TABDLY;
-				    sbuf.c_oflag |= TAB0;
+				if (TAB3 & sbuf.c_oflag) {
+				    sbuf.c_oflag &= ~TAB3;
 				} else {
-				    sbuf.c_oflag &= ~TABDLY;
 				    sbuf.c_oflag |= TAB3;
 				}
 				if (-1 ==