From owner-svn-src-head@freebsd.org Sat Mar 28 17:57:51 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AF62726101B; Sat, 28 Mar 2020 17:57:51 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48qRJr054fz3CmK; Sat, 28 Mar 2020 17:57:47 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4C47A18DBF; Sat, 28 Mar 2020 17:57:37 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02SHvbFb027719; Sat, 28 Mar 2020 17:57:37 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02SHvagt027715; Sat, 28 Mar 2020 17:57:36 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202003281757.02SHvagt027715@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sat, 28 Mar 2020 17:57:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359403 - in head/contrib/telnet: libtelnet telnetd X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head/contrib/telnet: libtelnet telnetd X-SVN-Commit-Revision: 359403 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2020 17:57:52 -0000 Author: kevans Date: Sat Mar 28 17:57:36 2020 New Revision: 359403 URL: https://svnweb.freebsd.org/changeset/base/359403 Log: Revert 359399: telnet -fno-common bits There was a large misfire from my local diff that I need to investigate, and this version committed did not build. Modified: head/contrib/telnet/libtelnet/encrypt.c head/contrib/telnet/telnetd/ext.h head/contrib/telnet/telnetd/sys_term.c head/contrib/telnet/telnetd/telnetd.c Modified: head/contrib/telnet/libtelnet/encrypt.c ============================================================================== --- head/contrib/telnet/libtelnet/encrypt.c Sat Mar 28 17:36:39 2020 (r359402) +++ head/contrib/telnet/libtelnet/encrypt.c Sat Mar 28 17:57:36 2020 (r359403) @@ -69,6 +69,13 @@ static const char sccsid[] = "@(#)encrypt.c 8.2 (Berke #include "encrypt.h" #include "misc.h" +/* + * These functions pointers point to the current routines + * for encrypting and decrypting data. + */ +void (*encrypt_output)(unsigned char *, int); +int (*decrypt_input)(int); + int EncryptType(char *type, char *mode); int EncryptStart(char *mode); int EncryptStop(char *mode); Modified: head/contrib/telnet/telnetd/ext.h ============================================================================== --- head/contrib/telnet/telnetd/ext.h Sat Mar 28 17:36:39 2020 (r359402) +++ head/contrib/telnet/telnetd/ext.h Sat Mar 28 17:57:36 2020 (r359403) @@ -58,7 +58,7 @@ extern int auth_level; extern slcfun slctab[NSLC + 1]; /* slc mapping table */ -extern char *terminaltype; +char *terminaltype; /* * I/O data buffers, pointers, and counters. @@ -175,10 +175,6 @@ void output_datalen(const char *, int); void startslave(char *, int, char *); #ifdef ENCRYPTION -/* - * These functions pointers point to the current routines - * for encrypting and decrypting data. - */ extern void (*encrypt_output)(unsigned char *, int); extern int (*decrypt_input)(int); extern char *nclearto; Modified: head/contrib/telnet/telnetd/sys_term.c ============================================================================== --- head/contrib/telnet/telnetd/sys_term.c Sat Mar 28 17:36:39 2020 (r359402) +++ head/contrib/telnet/telnetd/sys_term.c Sat Mar 28 17:57:36 2020 (r359403) @@ -376,6 +376,8 @@ spcset(int func, cc_t *valp, cc_t **valpp) * * Returns the file descriptor of the opened pty. */ +char line[32]; + int getpty(int *ptynum __unused) { Modified: head/contrib/telnet/telnetd/telnetd.c ============================================================================== --- head/contrib/telnet/telnetd/telnetd.c Sat Mar 28 17:36:39 2020 (r359402) +++ head/contrib/telnet/telnetd/telnetd.c Sat Mar 28 17:57:36 2020 (r359403) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #ifdef AUTHENTICATION #include +int auth_level = 0; #endif #ifdef ENCRYPTION #include