6 files changed, 55 insertions, 35 deletions
diff --git a/cpukit/telnetd/README b/cpukit/telnetd/README
index 3807aa5ebf..bf6dbb0524 100644
--- a/cpukit/telnetd/README
+++ b/cpukit/telnetd/README
@@ -1,13 +1,11 @@
-Author: fernando.ruiz@ctv.es (correo@fernando-ruiz.com)
+Author: Fernando Ruiz Casas <fruizcasas@gmail.com>
 
-This directory contains a telnetd server
-primary features:
+This directory contains a telnetd server with the primary features:
 
    + create a user shell pseudo-terminal task.
 
-This code has not been extensively tested.  It is provided as a tool
-for RTEMS users to open more shell tcp/ip pseudo-terminal.
-Suggestions and comments are appreciated.
+It is provided as a tool for RTEMS users to open more shell tcp/ip
+pseudo-terminal.  Suggestions and comments are appreciated.
 
 Read libmisc/shell for more information.
 
@@ -20,4 +18,3 @@ NOTES:
 
 Enjoy it.
 
-FUTURE:
diff --git a/cpukit/telnetd/check_passwd.c b/cpukit/telnetd/check_passwd.c
index b4ea4d010b..800f648011 100644
--- a/cpukit/telnetd/check_passwd.c
+++ b/cpukit/telnetd/check_passwd.c
@@ -42,13 +42,7 @@
  *
  * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
  *
- * Copyright (c) 2009 embedded brains GmbH and others.
- *
- * embedded brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * <rtems@embedded-brains.de>
+ * Copyright (c) 2009 embedded brains GmbH & Co. KG
  *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
diff --git a/cpukit/telnetd/des.h b/cpukit/telnetd/des.h
index 382dab7a8d..ecfa83271e 100644
--- a/cpukit/telnetd/des.h
+++ b/cpukit/telnetd/des.h
@@ -1 +1,34 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
+/**
+ *  @file
+ *
+ *  @brief
+ */
+
+/*
+ * Copyright (C) 2007 Till Straumann <strauman@slac.stanford.edu>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
 char *__des_crypt_r(const char *, const char *, char *, int);
diff --git a/cpukit/telnetd/pty.c b/cpukit/telnetd/pty.c
index a593bbd224..0753a799c1 100644
--- a/cpukit/telnetd/pty.c
+++ b/cpukit/telnetd/pty.c
@@ -1,8 +1,11 @@
+/**
+ * @file
+ * 
+ * @brief /dev/ptyXX  (Support for pseudo-terminals)
+ */
+
 /*
- * /dev/ptyXX  (Support for pseudo-terminals)
- *
- *  Original Author: Fernando RUIZ CASAS (fernando.ruiz@ctv.es)
- *  May 2001
+ * Copyright (c) 2001 Fernando Ruiz Casas <fruizcasas@gmail.com>
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/cpukit/telnetd/telnetd-init.c b/cpukit/telnetd/telnetd-init.c
index 586aaef75d..a2b1418ca8 100644
--- a/cpukit/telnetd/telnetd-init.c
+++ b/cpukit/telnetd/telnetd-init.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2018 embedded brains GmbH & Co. KG
  *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
diff --git a/cpukit/telnetd/telnetd.c b/cpukit/telnetd/telnetd.c
index 7dad2f2f92..5d1604e7d9 100644
--- a/cpukit/telnetd/telnetd.c
+++ b/cpukit/telnetd/telnetd.c
@@ -1,12 +1,7 @@
-/***********************************************************/
-/*
- *
- *  The telnet DAEMON
- *
- *  Author: 17,may 2001
- *
- *   WORK: fernando.ruiz@ctv.es
- *   HOME: correo@fernando-ruiz.com
+/**
+ * @file
+ * 
+ * @brief The telnet DAEMON
  *
  * After start the net you can start this daemon.
  * It uses the previously inited pseudo-terminales (pty.c)
@@ -17,19 +12,17 @@
  * this daemon interactively. (Login in /dev/console of course)
  *
  * Sorry but OOB is not still implemented. (This is the first version)
+ */
+
+/*
+ * Copyright (c) 2001 Fernando Ruiz Casas <fruizcasas@gmail.com>
  *
  * Till Straumann <strauman@slac.stanford.edu>
  *  - made the 'shell' interface more generic, i.e. it is now
  *    possible to have 'telnetd' run an arbitrary 'shell'
  *    program.
  *
- * Copyright (c) 2009, 2018 embedded brains GmbH and others.
- *
- *   embedded brains GmbH
- *   Dornierstr. 4
- *   D-82178 Puchheim
- *   Germany
- *   <rtems@embedded-brains.de>
+ * Copyright (C) 2009, 2018 embedded brains GmbH & Co. KG
  *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at