CVS commit: src/libexec/telnetd
Module Name:src
Committed By: joerg
Date: Thu Apr 23 00:03:41 UTC 2020
Modified Files:
src/libexec/telnetd: ext.h global.c
Log Message:
Don't play #define games with extern, just have a separate list to avoid commons
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/libexec/telnetd/ext.h
cvs rdiff -u -r1.8 -r1.9 src/libexec/telnetd/global.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/telnetd/ext.h
diff -u src/libexec/telnetd/ext.h:1.22 src/libexec/telnetd/ext.h:1.23
--- src/libexec/telnetd/ext.h:1.22 Tue Jan 10 23:39:11 2012
+++ src/libexec/telnetd/ext.h Thu Apr 23 00:03:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ext.h,v 1.22 2012/01/10 23:39:11 joerg Exp $ */
+/* $NetBSD: ext.h,v 1.23 2020/04/23 00:03:40 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -179,7 +179,7 @@ extern char *nclearto;
* The following are some clocks used to decide how to interpret
* the relationship between various variables.
*/
-extern struct {
+extern struct clockstate {
int
system, /* what the current time is */
echotoggle, /* last time user entered echo character */
Index: src/libexec/telnetd/global.c
diff -u src/libexec/telnetd/global.c:1.8 src/libexec/telnetd/global.c:1.9
--- src/libexec/telnetd/global.c:1.8 Thu Aug 7 09:46:51 2003
+++ src/libexec/telnetd/global.c Thu Apr 23 00:03:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: global.c,v 1.8 2003/08/07 09:46:51 agc Exp $ */
+/* $NetBSD: global.c,v 1.9 2020/04/23 00:03:40 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: global.c,v 1.8 2003/08/07 09:46:51 agc Exp $");
+__RCSID("$NetBSD: global.c,v 1.9 2020/04/23 00:03:40 joerg Exp $");
#endif
#endif /* not lint */
@@ -47,5 +47,50 @@ __RCSID("$NetBSD: global.c,v 1.8 2003/08
*/
#include
-#define extern
#include
+
+char options[256];
+char do_dont_resp[256];
+char will_wont_resp[256];
+int linemode; /* linemode on/off */
+#ifdef LINEMODE
+int uselinemode; /* what linemode to use (on/off) */
+int editmode; /* edit modes in use */
+int useeditmode; /* edit modes to use */
+int alwayslinemode; /* command line option */
+# ifdef KLUDGELINEMODE
+int lmodetype; /* Client support for linemode */
+# endif /* KLUDGELINEMODE */
+#endif /* LINEMODE */
+int flowmode; /* current flow control state */
+int restartany; /* restart output on any character state */
+#ifdef DIAGNOSTICS
+int diagnostic; /* telnet diagnostic capabilities */
+#endif /* DIAGNOSTICS */
+#ifdef SECURELOGIN
+int require_secure_login;
+#endif
+#ifdef AUTHENTICATION
+int auth_level;
+#endif
+
+slcfun slctab[NSLC + 1]; /* slc mapping table */
+char terminaltype[41];
+
+/*
+ * I/O data buffers, pointers, and counters.
+ */
+char ptyobuf[BUFSIZ+NETSLOP], *pfrontp, *pbackp;
+char netibuf[BUFSIZ], *netip;
+char netobuf[BUFSIZ+NETSLOP], *nfrontp, *nbackp;
+char *neturg; /* one past last bye of urgent data */
+int pcc, ncc;
+int pty, net;
+char *line;
+int SYNCHing; /* we are in TELNET SYNCH mode */
+
+#ifdef ENCRYPTION
+char *nclearto;
+#endif /* ENCRYPTION */
+
+struct clockstate clocks;
CVS commit: src/libexec/telnetd
Module Name:src Committed By: maya Date: Sat Dec 15 23:23:51 UTC 2018 Modified Files: src/libexec/telnetd: telnetd.8 Log Message: Remove mention of SPX. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/libexec/telnetd/telnetd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/telnetd/telnetd.8 diff -u src/libexec/telnetd/telnetd.8:1.31 src/libexec/telnetd/telnetd.8:1.32 --- src/libexec/telnetd/telnetd.8:1.31 Wed Apr 8 13:36:32 2009 +++ src/libexec/telnetd/telnetd.8 Sat Dec 15 23:23:51 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: telnetd.8,v 1.31 2009/04/08 13:36:32 joerg Exp $ +.\" $NetBSD: telnetd.8,v 1.32 2018/12/15 23:23:51 maya Exp $ .\" .\" Copyright (c) 1983, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)telnetd.8 8.3 (Berkeley) 3/1/94 .\" -.Dd July 17, 2004 +.Dd December 16, 2018 .Dt TELNETD 8 .Os .Sh NAME @@ -553,8 +553,6 @@ Telnet Remote Flow Control Option Telnet Authentication Option .It RFC 1411 Telnet Authentication: Kerberos Version 4 -.It RFC 1412 -Telnet Authentication: SPX .It RFC 1571 Telnet Environment Option Interoperability Issues .It RFC 1572
CVS commit: src/libexec/telnetd
Module Name:src
Committed By: maya
Date: Thu Dec 13 04:29:18 UTC 2018
Modified Files:
src/libexec/telnetd: sys_term.c
Log Message:
Remove unused macros.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/libexec/telnetd/sys_term.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/telnetd/sys_term.c
diff -u src/libexec/telnetd/sys_term.c:1.47 src/libexec/telnetd/sys_term.c:1.48
--- src/libexec/telnetd/sys_term.c:1.47 Fri Jun 28 15:48:02 2013
+++ src/libexec/telnetd/sys_term.c Thu Dec 13 04:29:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_term.c,v 1.47 2013/06/28 15:48:02 christos Exp $ */
+/* $NetBSD: sys_term.c,v 1.48 2018/12/13 04:29:18 maya Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: sys_term.c,v 1.47 2013/06/28 15:48:02 christos Exp $");
+__RCSID("$NetBSD: sys_term.c,v 1.48 2018/12/13 04:29:18 maya Exp $");
#endif
#endif /* not lint */
@@ -51,9 +51,6 @@ __RCSID("$NetBSD: sys_term.c,v 1.47 2013
#include
#endif
-#define SCPYN(a, b) (void) strncpy(a, b, sizeof(a))
-#define SCMPN(a, b) strncmp(a, b, sizeof(a))
-
struct termios termbuf, termbuf2; /* pty control structure */
void getptyslave(void);
CVS commit: src/libexec/telnetd
Module Name:src
Committed By: christos
Date: Sat Feb 10 19:34:34 UTC 2018
Modified Files:
src/libexec/telnetd: Makefile
Log Message:
We need authentication || encryption even when we are not building
kerberos. They are needed for telnet_net_write() which is used in libtelnet.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/libexec/telnetd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/telnetd/Makefile
diff -u src/libexec/telnetd/Makefile:1.51 src/libexec/telnetd/Makefile:1.52
--- src/libexec/telnetd/Makefile:1.51 Sun May 21 11:28:41 2017
+++ src/libexec/telnetd/Makefile Sat Feb 10 14:34:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2017/05/21 15:28:41 riastradh Exp $
+# $NetBSD: Makefile,v 1.52 2018/02/10 19:34:34 christos Exp $
# from: @(#)Makefile 8.2 (Berkeley) 12/15/93
WARNS?= 4 # XXX: const issues in sys_term.c
@@ -21,11 +21,12 @@ CPPFLAGS+=-I${.CURDIR}
LIBTELNETDIR!= cd ${.CURDIR}/../../lib/libtelnet; ${PRINTOBJDIR}
.if (${USE_KERBEROS} != "no")
-CPPFLAGS+=-DKRB5 -DAUTHENTICATION -DENCRYPTION
+CPPFLAGS+=-DKRB5
LDADD+= -lkrb5 -lasn1 -lcom_err -lroken -lsqlite3
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBSQLITE3}
.endif
+CPPFLAGS+=-DAUTHENTICATION -DENCRYPTION
LDADD+=-ldes -lcrypto -lcrypt
DPADD+=${LIBDES} ${LIBCRYPTO} ${LIBCRYPT}
CVS commit: src/libexec/telnetd
Module Name:src
Committed By: christos
Date: Sat Jan 28 23:40:51 UTC 2017
Modified Files:
src/libexec/telnetd: Makefile
Log Message:
kerberos needs sqlite3
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/libexec/telnetd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/telnetd/Makefile
diff -u src/libexec/telnetd/Makefile:1.49 src/libexec/telnetd/Makefile:1.50
--- src/libexec/telnetd/Makefile:1.49 Mon Jan 9 11:36:48 2012
+++ src/libexec/telnetd/Makefile Sat Jan 28 18:40:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2012/01/09 16:36:48 christos Exp $
+# $NetBSD: Makefile,v 1.50 2017/01/28 23:40:51 christos Exp $
# from: @(#)Makefile 8.2 (Berkeley) 12/15/93
WARNS?= 4 # XXX: const issues in sys_term.c
@@ -22,8 +22,8 @@ LIBTELNETDIR!= cd ${.CURDIR}/../../lib/l
.if (${USE_KERBEROS} != "no")
CPPFLAGS+=-DKRB5 -DAUTHENTICATION -DENCRYPTION
-LDADD+= -lkrb5 -lasn1 -lcom_err -lroken
-DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
+LDADD+= -lkrb5 -lasn1 -lcom_err -lroken -lsqlite3
+DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBSQLITE3}
.endif
.if (${MKCRYPTO} != "no")
CVS commit: src/libexec/telnetd
Module Name:src
Committed By: joerg
Date: Thu Feb 27 18:20:21 UTC 2014
Modified Files:
src/libexec/telnetd: telnetd.c
Log Message:
Global variable is never a null pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/libexec/telnetd/telnetd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/telnetd/telnetd.c
diff -u src/libexec/telnetd/telnetd.c:1.54 src/libexec/telnetd/telnetd.c:1.55
--- src/libexec/telnetd/telnetd.c:1.54 Tue Jan 10 23:39:11 2012
+++ src/libexec/telnetd/telnetd.c Thu Feb 27 18:20:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: telnetd.c,v 1.54 2012/01/10 23:39:11 joerg Exp $ */
+/* $NetBSD: telnetd.c,v 1.55 2014/02/27 18:20:21 joerg Exp $ */
/*
* Copyright (C) 1997 and 1998 WIDE Project.
@@ -65,7 +65,7 @@ __COPYRIGHT(@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = @(#)telnetd.c 8.4 (Berkeley) 5/30/95;
#else
-__RCSID($NetBSD: telnetd.c,v 1.54 2012/01/10 23:39:11 joerg Exp $);
+__RCSID($NetBSD: telnetd.c,v 1.55 2014/02/27 18:20:21 joerg Exp $);
#endif
#endif /* not lint */
@@ -650,9 +650,6 @@ terminaltypeok(char *s)
{
char buf[1024];
-if (terminaltype == NULL)
- return(1);
-
/*
* tgetent() will return 1 if the type is known, and
* 0 if it is not known. If it returns -1, it couldn't
CVS commit: src/libexec/telnetd
Module Name:src
Committed By: christos
Date: Fri Jun 28 15:48:02 UTC 2013
Modified Files:
src/libexec/telnetd: sys_term.c
Log Message:
fix wrong variable check, remove casts
http://m00nbsd.net/ae123a9bae03f7dde5c6d654412daf5a.html
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/libexec/telnetd/sys_term.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/telnetd/sys_term.c
diff -u src/libexec/telnetd/sys_term.c:1.46 src/libexec/telnetd/sys_term.c:1.47
--- src/libexec/telnetd/sys_term.c:1.46 Sun Nov 4 16:57:40 2012
+++ src/libexec/telnetd/sys_term.c Fri Jun 28 11:48:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_term.c,v 1.46 2012/11/04 21:57:40 christos Exp $ */
+/* $NetBSD: sys_term.c,v 1.47 2013/06/28 15:48:02 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)sys_term.c 8.4+1 (Berkeley) 5/30/95;
#else
-__RCSID($NetBSD: sys_term.c,v 1.46 2012/11/04 21:57:40 christos Exp $);
+__RCSID($NetBSD: sys_term.c,v 1.47 2013/06/28 15:48:02 christos Exp $);
#endif
#endif /* not lint */
@@ -690,7 +690,7 @@ addarg(char **argv, const char *val)
/*
* 10 entries, a leading length, and a null
*/
- argv = (char **)malloc(sizeof(*argv) * 12);
+ argv = malloc(sizeof(*argv) * 12);
if (argv == NULL)
return(NULL);
*argv++ = (char *)10;
@@ -700,9 +700,8 @@ addarg(char **argv, const char *val)
;
if (cpp == argv[(long)argv[-1]]) {
--argv;
- nargv = (char **)realloc(argv,
- sizeof(*argv) * ((long)(*argv) + 10 + 2));
- if (argv == NULL) {
+ nargv = realloc(argv, sizeof(*argv) * ((long)(*argv) + 10 + 2));
+ if (nargv == NULL) {
fatal(net, not enough memory);
/*NOTREACHED*/
}
CVS commit: src/libexec/telnetd
Module Name:src Committed By: christos Date: Sun Nov 4 21:57:40 UTC 2012 Modified Files: src/libexec/telnetd: sys_term.c Log Message: Only include the headers we use and remove useless variable. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/libexec/telnetd/sys_term.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/telnetd/sys_term.c diff -u src/libexec/telnetd/sys_term.c:1.45 src/libexec/telnetd/sys_term.c:1.46 --- src/libexec/telnetd/sys_term.c:1.45 Mon Jan 9 11:36:48 2012 +++ src/libexec/telnetd/sys_term.c Sun Nov 4 16:57:40 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_term.c,v 1.45 2012/01/09 16:36:48 christos Exp $ */ +/* $NetBSD: sys_term.c,v 1.46 2012/11/04 21:57:40 christos Exp $ */ /* * Copyright (c) 1989, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = @(#)sys_term.c 8.4+1 (Berkeley) 5/30/95; #else -__RCSID($NetBSD: sys_term.c,v 1.45 2012/01/09 16:36:48 christos Exp $); +__RCSID($NetBSD: sys_term.c,v 1.46 2012/11/04 21:57:40 christos Exp $); #endif #endif /* not lint */ @@ -44,8 +44,12 @@ __RCSID($NetBSD: sys_term.c,v 1.45 2012 #include util.h #include vis.h +#ifdef SUPPORT_UTMP #include utmp.h -struct utmp wtmp; +#endif +#ifdef SUPPORT_UTMPX +#include utmpx.h +#endif #define SCPYN(a, b) (void) strncpy(a, b, sizeof(a)) #define SCMPN(a, b) strncmp(a, b, sizeof(a))
CVS commit: src/libexec/telnetd
Module Name:src
Committed By: christos
Date: Mon Jan 9 16:36:48 UTC 2012
Modified Files:
src/libexec/telnetd: Makefile ext.h state.c sys_term.c telnetd.c
utility.c
Log Message:
PR/45805: Borodin Oleg: telnet/telnetd with -DAUTHENTICATION -DENCRYPTION
(rfc2941)
- separate MKCRYPTO from USE_KERBEROS
- WARNS=4
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/libexec/telnetd/Makefile
cvs rdiff -u -r1.20 -r1.21 src/libexec/telnetd/ext.h
cvs rdiff -u -r1.28 -r1.29 src/libexec/telnetd/state.c
cvs rdiff -u -r1.44 -r1.45 src/libexec/telnetd/sys_term.c
cvs rdiff -u -r1.52 -r1.53 src/libexec/telnetd/telnetd.c
cvs rdiff -u -r1.31 -r1.32 src/libexec/telnetd/utility.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/telnetd/Makefile
diff -u src/libexec/telnetd/Makefile:1.48 src/libexec/telnetd/Makefile:1.49
--- src/libexec/telnetd/Makefile:1.48 Sun Apr 24 17:42:06 2011
+++ src/libexec/telnetd/Makefile Mon Jan 9 11:36:48 2012
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2011/04/24 21:42:06 elric Exp $
+# $NetBSD: Makefile,v 1.49 2012/01/09 16:36:48 christos Exp $
# from: @(#)Makefile 8.2 (Berkeley) 12/15/93
-WARNS?= 2 # XXX: const issues in sys_term.c
+WARNS?= 4 # XXX: const issues in sys_term.c
.include bsd.own.mk
@@ -22,17 +22,18 @@ LIBTELNETDIR!= cd ${.CURDIR}/../../lib/l
.if (${USE_KERBEROS} != no)
CPPFLAGS+=-DKRB5 -DAUTHENTICATION -DENCRYPTION
-LDADD+= -lkrb5 -lasn1 -lcrypto -lcrypt
-DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+= -lkrb5 -lasn1 -lcom_err -lroken
+DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
+.endif
+
+.if (${MKCRYPTO} != no)
+LDADD+=-ldes -lcrypto -lcrypt
+DPADD+=${LIBDES} ${LIBCRYPTO} ${LIBCRYPT}
+.endif
.if (${USE_PAM} != no)
LDADD+= -lpam ${PAM_STATIC_LDADD}
DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
.endif
-LDADD+= -ldes -lcom_err -lroken
-DPADD+= ${LIBDES} ${LIBCOM_ERR} ${LIBROKEN}
-
-.endif
-
.include bsd.prog.mk
Index: src/libexec/telnetd/ext.h
diff -u src/libexec/telnetd/ext.h:1.20 src/libexec/telnetd/ext.h:1.21
--- src/libexec/telnetd/ext.h:1.20 Tue Jun 21 18:29:53 2005
+++ src/libexec/telnetd/ext.h Mon Jan 9 11:36:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ext.h,v 1.20 2005/06/21 22:29:53 lha Exp $ */
+/* $NetBSD: ext.h,v 1.21 2012/01/09 16:36:48 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -90,7 +90,7 @@ extern void
doeof(void),
dooption(int),
dontoption(int),
- edithost(char *, char *),
+ edithost(const char *, const char *),
fatal(int, const char *),
fatalperror(int, const char *),
get_slc_defaults(void),
@@ -103,7 +103,7 @@ extern void
netflush(void),
#ifdef DIAGNOSTICS
printoption(const char *, int),
- printdata(char *, char *, int),
+ printdata(const char *, char *, int),
#ifndef ENCRYPTION
printsub(int, unsigned char *, int),
#endif
@@ -130,7 +130,7 @@ extern void
tty_binaryout(int);
extern char *
- putf(char *, char *);
+ putf(const char *, char *);
extern int
end_slc(unsigned char **),
Index: src/libexec/telnetd/state.c
diff -u src/libexec/telnetd/state.c:1.28 src/libexec/telnetd/state.c:1.29
--- src/libexec/telnetd/state.c:1.28 Fri Dec 23 11:56:54 2011
+++ src/libexec/telnetd/state.c Mon Jan 9 11:36:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: state.c,v 1.28 2011/12/23 16:56:54 christos Exp $ */
+/* $NetBSD: state.c,v 1.29 2012/01/09 16:36:48 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)state.c 8.5 (Berkeley) 5/30/95;
#else
-__RCSID($NetBSD: state.c,v 1.28 2011/12/23 16:56:54 christos Exp $);
+__RCSID($NetBSD: state.c,v 1.29 2012/01/09 16:36:48 christos Exp $);
#endif
#endif /* not lint */
@@ -45,10 +45,6 @@ __RCSID($NetBSD: state.c,v 1.28 2011/12
static int envvarok(char *);
-unsigned const char doopt[] = { IAC, DO, '%', 'c', 0 };
-unsigned const char dont[] = { IAC, DONT, '%', 'c', 0 };
-unsigned const char will[] = { IAC, WILL, '%', 'c', 0 };
-unsigned const char wont[] = { IAC, WONT, '%', 'c', 0 };
int not42 = 1;
/*
@@ -437,7 +433,7 @@ send_do(int option, int init)
set_his_want_state_will(option);
do_dont_resp[option]++;
}
- (void) output_data((const char *)doopt, option);
+ (void) output_data(%c%c%c, IAC, DO, option);
DIAG(TD_OPTIONS, printoption(td: send do, option));
}
@@ -657,7 +653,7 @@ send_dont(int option, int init)
set_his_want_state_wont(option);
do_dont_resp[option]++;
}
- (void) output_data((const char *)dont, option);
+ (void) output_data(%c%c%c, IAC, DONT, option);
DIAG(TD_OPTIONS, printoption(td: send dont, option));
}
@@ -805,7 +801,7 @@ send_will(int option, int init)
set_my_want_state_will(option);
will_wont_resp[option]++;
}
- (void) output_data((const char *)will, option);
+ (void) output_data(%c%c%c, IAC, WILL, option);
DIAG(TD_OPTIONS, printoption(td: send will, option));
}
@@ -959,7 +955,7 @@ send_wont(int
CVS commit: src/libexec/telnetd
Module Name:src
Committed By: christos
Date: Fri Dec 23 16:56:54 UTC 2011
Modified Files:
src/libexec/telnetd: state.c
Log Message:
there is a macro for that, use it.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/libexec/telnetd/state.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/telnetd/state.c
diff -u src/libexec/telnetd/state.c:1.27 src/libexec/telnetd/state.c:1.28
--- src/libexec/telnetd/state.c:1.27 Wed Feb 21 16:14:07 2007
+++ src/libexec/telnetd/state.c Fri Dec 23 11:56:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: state.c,v 1.27 2007/02/21 21:14:07 hubertf Exp $ */
+/* $NetBSD: state.c,v 1.28 2011/12/23 16:56:54 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)state.c 8.5 (Berkeley) 5/30/95;
#else
-__RCSID($NetBSD: state.c,v 1.27 2007/02/21 21:14:07 hubertf Exp $);
+__RCSID($NetBSD: state.c,v 1.28 2011/12/23 16:56:54 christos Exp $);
#endif
#endif /* not lint */
@@ -1212,7 +1212,7 @@ suboption(void)
* Process suboption buffer of slc's
*/
start_slc(1);
- do_opt_slc(subpointer, subend - subpointer);
+ do_opt_slc(subpointer, SB_LEN());
(void) end_slc(0);
break;
} else if (request == LM_MODE) {
CVS commit: src/libexec/telnetd
Module Name:src Committed By: elric Date: Sun Apr 24 21:18:24 UTC 2011 Modified Files: src/libexec/telnetd: telnetd.c Log Message: #include com_err.h - #include krb5/com_err.h. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/libexec/telnetd/telnetd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/telnetd/telnetd.c diff -u src/libexec/telnetd/telnetd.c:1.51 src/libexec/telnetd/telnetd.c:1.52 --- src/libexec/telnetd/telnetd.c:1.51 Sun Jul 20 01:09:07 2008 +++ src/libexec/telnetd/telnetd.c Sun Apr 24 21:18:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: telnetd.c,v 1.51 2008/07/20 01:09:07 lukem Exp $ */ +/* $NetBSD: telnetd.c,v 1.52 2011/04/24 21:18:24 elric Exp $ */ /* * Copyright (C) 1997 and 1998 WIDE Project. @@ -65,7 +65,7 @@ #if 0 static char sccsid[] = @(#)telnetd.c 8.4 (Berkeley) 5/30/95; #else -__RCSID($NetBSD: telnetd.c,v 1.51 2008/07/20 01:09:07 lukem Exp $); +__RCSID($NetBSD: telnetd.c,v 1.52 2011/04/24 21:18:24 elric Exp $); #endif #endif /* not lint */ @@ -83,7 +83,7 @@ #define Authenticator k5_Authenticator #include krb5.h #undef Authenticator -#include com_err.h +#include krb5/com_err.h #endif #ifdef AUTHENTICATION
