From MAILER-DAEMON Thu May 02 17:42:16 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UY1Ga-0006bq-Fw
	for mharc-commit-inetutils@gnu.org; Thu, 02 May 2013 17:42:16 -0400
Received: from eggs.gnu.org ([208.118.235.92]:52990)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UY1GW-0006Yt-6p
	for commit-inetutils@gnu.org; Thu, 02 May 2013 17:42:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UY1GT-0002ln-CQ
	for commit-inetutils@gnu.org; Thu, 02 May 2013 17:42:12 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40641)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UY1GT-0002lX-9I
	for commit-inetutils@gnu.org; Thu, 02 May 2013 17:42:09 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1UY1GS-0006Cw-B9
	for commit-inetutils@gnu.org; Thu, 02 May 2013 21:42:08 +0000
Date: Thu, 02 May 2013 21:42:08 +0000
Message-Id: <E1UY1GS-0006Cw-B9@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-280-g0c3f38b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4aa58d1102e0b24a75420f906d87d5db42858118
X-Git-Newrev: 0c3f38bbdabd5721bb2ccccce624a5592ababad5
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 May 2013 21:42:15 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  0c3f38bbdabd5721bb2ccccce624a5592ababad5 (commit)
       via  9e1ff87298b4626e59398a7b9c39ca1fb6eef124 (commit)
      from  4aa58d1102e0b24a75420f906d87d5db42858118 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0c3f38bbdabd5721bb2ccccce624a5592ababad5


commit 0c3f38bbdabd5721bb2ccccce624a5592ababad5
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed May 1 23:37:47 2013 +0200

    Small code clean-up.

diff --git a/ChangeLog b/ChangeLog
index a3e9272..4473fd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2013-05-01  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* libtelnet/enc_des.c: Convert K&R style declarations
+	to ISO C89.  Do assignments before return statements.
+	(fb64_stream_iv, fb64_init, fb64_is, fb64_reply)
+	(fb64_stream_key, fb64_keyid): Declare as static.
+	(shishi_des_ecb_encrypt) [SHISHI]: Declare as static.
+	Declare all three string arguments using `unsigned char'.
+	When calling shishi_des(), cast third and sixth arguments
+	as `const char *'.
+	(fb64_start): Remove variable B.  Change X to size_t.
+	(fb64_is): Remove B and X.
+	(fb64_reply): Remove B, P, and X.
+
 2013-04-30  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	ftpd: Account expiration.
diff --git a/libtelnet/enc_des.c b/libtelnet/enc_des.c
index 695b532..614e7c9 100644
--- a/libtelnet/enc_des.c
+++ b/libtelnet/enc_des.c
@@ -73,8 +73,8 @@ extern int encrypt_debug_mode;
 #   define NO_RECV_IV	2
 #   define NO_KEYID	4
 #   define IN_PROGRESS	(NO_SEND_IV|NO_RECV_IV|NO_KEYID)
-#   define SUCCESS		0
-#   define FAILED		-1
+#   define SUCCESS	0
+#   define FAILED	-1
 
 
 #   include <string.h>
@@ -127,7 +127,7 @@ struct keyidlist
 
 #   define SHIFT_VAL(a,b)	(KEYFLAG_SHIFT*((a)+((b)*2)))
 
-#   define FB64_IV		1
+#   define FB64_IV	1
 #   define FB64_IV_OK	2
 #   define FB64_IV_BAD	3
 
@@ -135,31 +135,31 @@ struct keyidlist
 /* Callback from consumer.  */
 extern void printsub (char, unsigned char *, int);
 
-void fb64_stream_iv (Block, struct stinfo *);
-void fb64_init (struct fb *);
+static void fb64_stream_iv (Block, struct stinfo *);
+static void fb64_init (struct fb *);
 static int fb64_start (struct fb *, int, int);
-int fb64_is (unsigned char *, int, struct fb *);
-int fb64_reply (unsigned char *, int, struct fb *);
+static int fb64_is (unsigned char *, int, struct fb *);
+static int fb64_reply (unsigned char *, int, struct fb *);
 static void fb64_session (Session_Key *, int, struct fb *);
-void fb64_stream_key (Block, struct stinfo *);
-int fb64_keyid (int, unsigned char *, int *, struct fb *);
+static void fb64_stream_key (Block, struct stinfo *);
+static int fb64_keyid (int, unsigned char *, int *, struct fb *);
 
 #   ifdef SHISHI
-void
-shishi_des_ecb_encrypt (Shishi * h, const char key[8], const char *in,
-			char *out)
+static void
+shishi_des_ecb_encrypt (Shishi * h, const unsigned char key[8],
+			const unsigned char *in, unsigned char *out)
 {
   char *tmp;
 
-  shishi_des (h, 0, key, NULL, NULL, in, 8, &tmp);
+  shishi_des (h, 0, (const char *) key, NULL, NULL,
+	      (const char *) in, 8, &tmp);
   memcpy (out, tmp, 8);
   free (tmp);
 }
 #   endif
 
 void
-cfb64_init (server)
-     int server;
+cfb64_init (int server)
 {
   fb64_init (&fb[CFB]);
   fb[CFB].fb_feed[4] = ENCTYPE_DES_CFB64;
@@ -169,8 +169,7 @@ cfb64_init (server)
 
 #   ifdef ENCTYPE_DES_OFB64
 void
-ofb64_init (server)
-     int server;
+ofb64_init (int server)
 {
   fb64_init (&fb[OFB]);
   fb[OFB].fb_feed[4] = ENCTYPE_DES_OFB64;
@@ -179,9 +178,8 @@ ofb64_init (server)
 }
 #   endif /* ENCTYPE_DES_OFB64 */
 
-void
-fb64_init (fbp)
-     register struct fb *fbp;
+static void
+fb64_init (register struct fb *fbp)
 {
   memset ((void *) fbp, 0, sizeof (*fbp));
   fbp->state[0] = fbp->state[1] = FAILED;
@@ -200,31 +198,23 @@ fb64_init (fbp)
  *	    Kerberos) have to happen before we can continue.
  */
 int
-cfb64_start (dir, server)
-     int dir;
-     int server;
+cfb64_start (int dir, int server)
 {
   return (fb64_start (&fb[CFB], dir, server));
 }
 
 #   ifdef ENCTYPE_DES_OFB64
 int
-ofb64_start (dir, server)
-     int dir;
-     int server;
+ofb64_start (int dir, int server)
 {
   return (fb64_start (&fb[OFB], dir, server));
 }
 #   endif /* ENCTYPE_DES_OFB64 */
 
 static int
-fb64_start (fbp, dir, server)
-     struct fb *fbp;
-     int dir;
-     int server;
+fb64_start (struct fb *fbp, int dir, int server)
 {
-  Block b;
-  int x;
+  size_t x;
   unsigned char *p;
   register int state;
 
@@ -285,7 +275,10 @@ fb64_start (fbp, dir, server)
     default:
       return (FAILED);
     }
-  return (fbp->state[dir - 1] = state);
+
+  fbp->state[dir - 1] = state;
+
+  return (state);
 }
 
 /*
@@ -295,32 +288,23 @@ fb64_start (fbp, dir, server)
  *	 1: successful, negotiation not done yet.
  */
 int
-cfb64_is (data, cnt)
-     unsigned char *data;
-     int cnt;
+cfb64_is (unsigned char *data, int cnt)
 {
   return (fb64_is (data, cnt, &fb[CFB]));
 }
 
 #   ifdef ENCTYPE_DES_OFB64
 int
-ofb64_is (data, cnt)
-     unsigned char *data;
-     int cnt;
+ofb64_is (unsigned char *data, int cnt)
 {
   return (fb64_is (data, cnt, &fb[OFB]));
 }
 #   endif /* ENCTYPE_DES_OFB64 */
 
-int
-fb64_is (data, cnt, fbp)
-     unsigned char *data;
-     int cnt;
-     struct fb *fbp;
+static int
+fb64_is (unsigned char *data, int cnt, struct fb *fbp)
 {
-  int x;
   unsigned char *p;
-  Block b;
   register int state = fbp->state[DIR_DECRYPT - 1];
 
   if (cnt-- < 1)
@@ -382,7 +366,10 @@ fb64_is (data, cnt, fbp)
 
       break;
     }
-  return (fbp->state[DIR_DECRYPT - 1] = state);
+
+  fbp->state[DIR_DECRYPT - 1] = state;
+
+  return (state);
 }
 
 /*
@@ -392,33 +379,23 @@ fb64_is (data, cnt, fbp)
  *	 1: successful, negotiation not done yet.
  */
 int
-cfb64_reply (data, cnt)
-     unsigned char *data;
-     int cnt;
+cfb64_reply (unsigned char *data, int cnt)
 {
   return (fb64_reply (data, cnt, &fb[CFB]));
 }
 
 #   ifdef ENCTYPE_DES_OFB64
 int
-ofb64_reply (data, cnt)
-     unsigned char *data;
-     int cnt;
+ofb64_reply (unsigned char *data, int cnt)
 {
   return (fb64_reply (data, cnt, &fb[OFB]));
 }
 #   endif /* ENCTYPE_DES_OFB64 */
 
 
-int
-fb64_reply (data, cnt, fbp)
-     unsigned char *data;
-     int cnt;
-     struct fb *fbp;
+static int
+fb64_reply (unsigned char *data, int cnt, struct fb *fbp)
 {
-  int x;
-  unsigned char *p;
-  Block b;
   register int state = fbp->state[DIR_ENCRYPT - 1];
 
   if (cnt-- < 1)
@@ -452,32 +429,28 @@ fb64_reply (data, cnt, fbp)
       state = FAILED;
       break;
     }
-  return (fbp->state[DIR_ENCRYPT - 1] = state);
+
+  fbp->state[DIR_ENCRYPT - 1] = state;
+
+  return (state);
 }
 
 void
-cfb64_session (key, server)
-     Session_Key *key;
-     int server;
+cfb64_session (Session_Key *key, int server)
 {
   fb64_session (key, server, &fb[CFB]);
 }
 
 #   ifdef ENCTYPE_DES_OFB64
 void
-ofb64_session (key, server)
-     Session_Key *key;
-     int server;
+ofb64_session (Session_Key *key, int server)
 {
   fb64_session (key, server, &fb[OFB]);
 }
 #   endif /* ENCTYPE_DES_OFB64 */
 
 static void
-fb64_session (key, server, fbp)
-     Session_Key *key;
-     int server;
-     struct fb *fbp;
+fb64_session (Session_Key *key, int server, struct fb *fbp)
 {
 
   if (!key || key->type != SK_DES)
@@ -486,8 +459,9 @@ fb64_session (key, server, fbp)
       if (encrypt_debug_mode)
 	printf ("Can't set krbdes's session key (%d != %d)\r\n",
 		key ? key->type : -1, SK_DES);
-      return;
+      return;	/* XXX: Causes a segfault.  */
     }
+
   memmove ((void *) fbp->krbdes_key, (void *) key->data, sizeof (Block));
 
   fb64_stream_key (fbp->krbdes_key, &fbp->streams[DIR_ENCRYPT - 1]);
@@ -504,8 +478,8 @@ fb64_session (key, server, fbp)
   des_key_sched (fbp->krbdes_key, fbp->krbdes_sched);
 #   endif
   /*
-   * Now look to see if krbdes_start() was was waiting for
-   * the key to show up.  If so, go ahead an call it now
+   * Now look to see if krbdes_start() was waiting for
+   * the key to show up.  If so, go ahead and call it now
    * that we have the key.
    */
   if (fbp->need_start)
@@ -520,28 +494,21 @@ fb64_session (key, server, fbp)
  * 0, then mark the state as SUCCESS.
  */
 int
-cfb64_keyid (dir, kp, lenp)
-     int dir, *lenp;
-     unsigned char *kp;
+cfb64_keyid (int dir, unsigned char *kp, int *lenp)
 {
   return (fb64_keyid (dir, kp, lenp, &fb[CFB]));
 }
 
 #   ifdef ENCTYPE_DES_OFB64
 int
-ofb64_keyid (dir, kp, lenp)
-     int dir, *lenp;
-     unsigned char *kp;
+ofb64_keyid (int dir, unsigned char *kp, int *lenp)
 {
   return (fb64_keyid (dir, kp, lenp, &fb[OFB]));
 }
 #   endif /* ENCTYPE_DES_OFB64 */
 
-int
-fb64_keyid (dir, kp, lenp, fbp)
-     int dir, *lenp;
-     unsigned char *kp;
-     struct fb *fbp;
+static int
+fb64_keyid (int dir, unsigned char *kp, int *lenp, struct fb *fbp)
 {
   register int state = fbp->state[dir - 1];
 
@@ -556,13 +523,15 @@ fb64_keyid (dir, kp, lenp, fbp)
 
   state &= ~NO_KEYID;
 
-  return (fbp->state[dir - 1] = state);
+  fbp->state[dir - 1] = state;
+
+  return (state);
 }
 
-void
-fb64_printsub (data, cnt, buf, buflen, type)
-     unsigned char *data, *buf, *type;
-     int cnt, buflen;
+static void
+fb64_printsub (unsigned char *data, int cnt,
+	       unsigned char *buf, int buflen,
+	       const char *type)
 {
   char lbuf[32];
   register int i;
@@ -605,27 +574,23 @@ fb64_printsub (data, cnt, buf, buflen, type)
 }
 
 void
-cfb64_printsub (data, cnt, buf, buflen)
-     unsigned char *data, *buf;
-     int cnt, buflen;
+cfb64_printsub (unsigned char *data, int cnt,
+		unsigned char *buf, int buflen)
 {
   fb64_printsub (data, cnt, buf, buflen, "CFB64");
 }
 
 #   ifdef ENCTYPE_DES_OFB64
 void
-ofb64_printsub (data, cnt, buf, buflen)
-     unsigned char *data, *buf;
-     int cnt, buflen;
+ofb64_printsub (unsigned char *data, int cnt,
+		unsigned char *buf, int buflen)
 {
   fb64_printsub (data, cnt, buf, buflen, "OFB64");
 }
 #   endif /* ENCTYPE_DES_OFB64 */
 
-void
-fb64_stream_iv (seed, stp)
-     Block seed;
-     register struct stinfo *stp;
+static void
+fb64_stream_iv (Block seed, register struct stinfo *stp)
 {
 
   memmove ((void *) stp->str_iv, (void *) seed, sizeof (Block));
@@ -638,10 +603,8 @@ fb64_stream_iv (seed, stp)
   stp->str_index = sizeof (Block);
 }
 
-void
-fb64_stream_key (key, stp)
-     Block key;
-     register struct stinfo *stp;
+static void
+fb64_stream_key (Block key, register struct stinfo *stp)
 {
   memmove ((void *) stp->str_ikey, (void *) key, sizeof (Block));
 #   ifndef SHISHI
@@ -675,9 +638,7 @@ fb64_stream_key (key, stp)
  */
 
 void
-cfb64_encrypt (s, c)
-     register unsigned char *s;
-     int c;
+cfb64_encrypt (register unsigned char *s, int c)
 {
   register struct stinfo *stp = &fb[CFB].streams[DIR_ENCRYPT - 1];
   register int index;
@@ -707,8 +668,7 @@ cfb64_encrypt (s, c)
 }
 
 int
-cfb64_decrypt (data)
-     int data;
+cfb64_decrypt (int data)
 {
   register struct stinfo *stp = &fb[CFB].streams[DIR_DECRYPT - 1];
   int index;
@@ -742,6 +702,7 @@ cfb64_decrypt (data)
 
   /* On decryption we store (data) which is cypher. */
   stp->str_output[index] = data;
+
   return (data ^ stp->str_feed[index]);
 }
 
@@ -766,9 +727,7 @@ cfb64_decrypt (data)
  */
 #   ifdef ENCTYPE_DES_OFB64
 void
-ofb64_encrypt (s, c)
-     register unsigned char *s;
-     int c;
+ofb64_encrypt (register unsigned char *s, int c)
 {
   register struct stinfo *stp = &fb[OFB].streams[DIR_ENCRYPT - 1];
   register int index;
@@ -795,8 +754,7 @@ ofb64_encrypt (s, c)
 }
 
 int
-ofb64_decrypt (data)
-     int data;
+ofb64_decrypt (int data)
 {
   register struct stinfo *stp = &fb[OFB].streams[DIR_DECRYPT - 1];
   int index;

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=9e1ff87298b4626e59398a7b9c39ca1fb6eef124


commit 9e1ff87298b4626e59398a7b9c39ca1fb6eef124
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue Apr 30 23:58:17 2013 +0200

    ftpd: Account expiration.

diff --git a/ChangeLog b/ChangeLog
index 0665618..a3e9272 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2013-04-30  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	ftpd: Account expiration.
+	Better explanation, make it work also for BSD.
+
+	* configure.ac (HAVE_STRUCT_PASSWD_PW_EXPIRE)
+	(HAVE_STRUCT_PASSWD_PW_CHANGE): Check if `struct passwd'
+	has members pw_expire and pw_change.
+
+	* ftpd/extern.h (struct credentials): New member `expired'.
+	(AUTH_EXPIRED_NOT, AUTH_EXPIRED_ACCT, AUTH_EXPIRED_PASS):
+	New macros.
+	* ftpd/ftpd.c (pass) <failed authentication>:
+	If `cred.message' is empty, check `cred.expired' for
+	further reasons of failure.
+	* ftpd/auth.c (auth_user): Reset `pcred->expired'.
+	(sgetcred): [HAVE_GETSPNAM && HAVE_SHADOW_H]:
+	Separate account and password expiration into distinct
+	checks, updating `pcred->expired'.  Use shadow password
+	only in absence of all expiration.
+	[HAVE_STRUCT_PASSWD_PW_EXPIRE]: New code block.
+
 2013-04-26  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	rcp: Make encryption portable.
diff --git a/configure.ac b/configure.ac
index 9b49f4f..4fe029c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -653,6 +653,11 @@ IU_CHECK_MEMBERS([struct sockaddr_storage.ss_len], , ,
       #include <sys/socket.h>
       #include <netinet/in.h> ])
 
+IU_CHECK_MEMBERS([struct passwd.pw_expire, struct passwd.pw_change],
+    [], [],
+    [ #include <sys/types.h>
+      #include <pwd.h>])
+
 if test "$ac_cv_header_utmp_h" = yes; then
   AC_CHECK_TYPES(struct lastlog, , , [#include <utmp.h>])
   IU_CHECK_MEMBERS([struct utmp.ut_type, struct utmp.ut_pid,
diff --git a/ftpd/auth.c b/ftpd/auth.c
index 8773a59..d7a55ef 100644
--- a/ftpd/auth.c
+++ b/ftpd/auth.c
@@ -50,6 +50,7 @@ auth_user (const char *name, struct credentials *pcred)
   int err = 0;		/* Never remove initialisation!  */
 
   pcred->guest = 0;
+  pcred->expired = AUTH_EXPIRED_NOT;
 
   switch (pcred->auth_type)
     {
@@ -223,19 +224,55 @@ sgetcred (const char *name, struct credentials *pcred)
 	  long today;
 	  now = time ((time_t *) 0);
 	  today = now / (60 * 60 * 24);
-	  if ((spw->sp_expire > 0 && spw->sp_expire < today)
-	      || (spw->sp_max > 0 && spw->sp_lstchg > 0
-		  && (spw->sp_lstchg + spw->sp_max < today)))
+
+	  if (spw->sp_expire > 0 && spw->sp_expire < today)
+	    {
+	      p->pw_passwd = NULL;
+	      pcred->expired |= AUTH_EXPIRED_ACCT;
+	    }
+	  if (spw->sp_max > 0 && spw->sp_lstchg > 0
+		   && (spw->sp_lstchg + spw->sp_max < today))
 	    {
-	      /*reply (530, "Login expired."); */
 	      p->pw_passwd = NULL;
+	      pcred->expired |= AUTH_EXPIRED_PASS;
 	    }
-	  else
+
+	  if (pcred->expired == AUTH_EXPIRED_NOT)
 	    p->pw_passwd = spw->sp_pwdp;
 	}
       endspent ();
     }
-#endif
+#elif defined HAVE_STRUCT_PASSWD_PW_EXPIRE	/* !HAVE_SHADOW_H */
+  /* BSD systems provide pw_expire as epoch time,
+   * and the password is exposed in pw_passwd for
+   * a caller with euid 0.
+   *
+   * NetBSD allows -1 for 'pw_change', meaning that immediate
+   * change is required.  Let us deny access in that case..
+   */
+  if (p->pw_expire > 0
+# ifdef HAVE_STRUCT_PASSWD_PW_CHANGE
+      || p->pw_change
+# endif
+     )
+    {
+      time_t now = time ((time_t *) 0);
+
+      if (p->pw_expire > 0 && difftime (p->pw_expire, now) < 0)
+	{
+	  p->pw_passwd = NULL;
+	  pcred->expired |= AUTH_EXPIRED_ACCT;
+	}
+# ifdef HAVE_STRUCT_PASSWD_PW_CHANGE
+      if (p->pw_change && difftime (p->pw_change, now) < 0)
+	{
+	  p->pw_passwd = NULL;
+	  pcred->expired |= AUTH_EXPIRED_PASS;
+	}
+# endif
+    }
+#endif /* !HAVE_STRUCT_PASSWD_PW_EXPIRE */
+
   pcred->uid = p->pw_uid;
   pcred->gid = p->pw_gid;
   pcred->name = sgetsave (p->pw_name);
diff --git a/ftpd/extern.h b/ftpd/extern.h
index aa52530..a379fe7 100644
--- a/ftpd/extern.h
+++ b/ftpd/extern.h
@@ -140,6 +140,10 @@ struct credentials
   int guest;
   int dochroot;
   int logged_in;
+#define AUTH_EXPIRED_NOT    0
+#define AUTH_EXPIRED_ACCT   1
+#define AUTH_EXPIRED_PASS   2
+  int expired;
 #define AUTH_TYPE_PASSWD    0
 #define AUTH_TYPE_PAM       1
 #define AUTH_TYPE_KERBEROS  2
@@ -148,7 +152,10 @@ struct credentials
   int auth_type;
 };
 
+/* Exported from ftpd.c */
 extern struct credentials cred;
+
+/* Exported from auth.c */
 extern int sgetcred (const char *, struct credentials *);
 extern int auth_user (const char *, struct credentials *);
 extern int auth_pass (const char *, struct credentials *);
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index b333004..1a1eac0 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -854,7 +854,7 @@ end_login (struct credentials *pcred)
   free (pcred->homedir);
   free (pcred->rootdir);
   free (pcred->shell);
-  if (pcred->pass)		/* ??? */
+  if (pcred->pass)		/* Properly erase old password.  */
     {
       memset (pcred->pass, 0, strlen (pcred->pass));
       free (pcred->pass);
@@ -881,15 +881,20 @@ pass (const char *passwd)
       /* Try to authenticate the user.  Failed if != 0.  */
       if (auth_pass (passwd, &cred) != 0)
 	{
-	  /* Any particular reasons.  */
+	  /* Any particular reason?  */
 	  if (cred.message)
 	    {
 	      reply (530, "%s", cred.message);
 	      free (cred.message);
 	      cred.message = NULL;
 	    }
+	  else if (cred.expired & AUTH_EXPIRED_ACCT)
+	    reply (530, "Account is expired.");
+	  else if (cred.expired & AUTH_EXPIRED_PASS)
+	    reply (530, "Password has expired.");
 	  else
 	    reply (530, "Login incorrect.");
+
 	  if (logging)
 	    syslog (LOG_NOTICE, "FTP LOGIN FAILED FROM %s, %s",
 		    cred.remotehost, curname);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |   36 ++++++++++
 configure.ac        |    5 ++
 ftpd/auth.c         |   49 ++++++++++++--
 ftpd/extern.h       |    7 ++
 ftpd/ftpd.c         |    9 ++-
 libtelnet/enc_des.c |  188 ++++++++++++++++++++-------------------------------
 6 files changed, 171 insertions(+), 123 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue May 07 16:42:39 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UZoid-00062r-2O
	for mharc-commit-inetutils@gnu.org; Tue, 07 May 2013 16:42:39 -0400
Received: from eggs.gnu.org ([208.118.235.92]:38033)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UZoiY-00062E-V8
	for commit-inetutils@gnu.org; Tue, 07 May 2013 16:42:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UZoiX-0004Ma-1I
	for commit-inetutils@gnu.org; Tue, 07 May 2013 16:42:34 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50181)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UZoiW-0004LH-U8
	for commit-inetutils@gnu.org; Tue, 07 May 2013 16:42:32 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1UZoiW-0003AJ-AT
	for commit-inetutils@gnu.org; Tue, 07 May 2013 20:42:32 +0000
Date: Tue, 07 May 2013 20:42:32 +0000
Message-Id: <E1UZoiW-0003AJ-AT@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-281-gb997ed9
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0c3f38bbdabd5721bb2ccccce624a5592ababad5
X-Git-Newrev: b997ed983b4bf6e71a1f6419fe384c8f62e0004d
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 May 2013 20:42:37 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  b997ed983b4bf6e71a1f6419fe384c8f62e0004d (commit)
      from  0c3f38bbdabd5721bb2ccccce624a5592ababad5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=b997ed983b4bf6e71a1f6419fe384c8f62e0004d


commit b997ed983b4bf6e71a1f6419fe384c8f62e0004d
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue May 7 21:43:49 2013 +0200

    configure.ac: Minor clean-up.

diff --git a/ChangeLog b/ChangeLog
index 4473fd4..d40358d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2013-05-07  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	configure.ac: Minor clean-up.
+
+	* am/config_paths.m4 (IU_CONFIG_PATHS):
+	Replace obsolete AC_HELP_STRING by AS_HELP_STRING.
+	* am/libcurses.m4 (IU_LIB_NCURSES): Likewise.
+	* am/readline.m4 (gl_FUNC_READLINE): Likewise.
+	* configure.ac: Likewise.  Use AC_CONFIG_HEADERS
+	instead of AC_CONFIG_HEADER.  Call AM_PROG_AR,
+	but protect its use by means of m4_ifdef.
+	(AM_INIT_AUTOMAKE): Add `-Wall' and `-Werror'.
+	Remove second call to the same macro.
+
 2013-05-01  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* libtelnet/enc_des.c: Convert K&R style declarations
diff --git a/am/config_paths.m4 b/am/config_paths.m4
index 0c2fea9..d442eb2 100644
--- a/am/config_paths.m4
+++ b/am/config_paths.m4
@@ -47,7 +47,7 @@ AC_DEFUN([IU_CONFIG_PATHS], [
   dnl We actually look for `with_' variables corresponding to each path
   dnl configured.
   AC_ARG_WITH([PATHVAR],
-              AC_HELP_STRING([--with-PATHVAR=PATH],
+              AS_HELP_STRING([--with-PATHVAR=PATH],
                              [Set the value of PATHVAR to PATH
                           PATHVAR is the name of a \`PATH_FOO' variable,
                           downcased, with \`_' changed to \`-']))
diff --git a/am/libcurses.m4 b/am/libcurses.m4
index 37aa650..962a6e6 100644
--- a/am/libcurses.m4
+++ b/am/libcurses.m4
@@ -29,7 +29,7 @@ dnl -I flag to get access to ncurses include files.
 dnl
 AC_DEFUN([IU_LIB_NCURSES], [
   AC_ARG_ENABLE([ncurses],
-                AC_HELP_STRING([--disable-ncurses],
+                AS_HELP_STRING([--disable-ncurses],
                                [don't prefer -lncurses over -lcurses]),
               , [enable_ncurses=yes])
   if test "$enable_ncurses" = yes; then
@@ -39,7 +39,7 @@ AC_DEFUN([IU_LIB_NCURSES], [
       # is there a better way of doing this, that avoids looking in specific
       # directories?
       AC_ARG_WITH([ncurses-include-dir],
-                  AC_HELP_STRING([--with-ncurses-include-dir=DIR],
+                  AS_HELP_STRING([--with-ncurses-include-dir=DIR],
                                  [Set directory containing the include files for
                           use with -lncurses, when it isn't installed as
                           the default curses library.  If DIR is "none",
diff --git a/am/readline.m4 b/am/readline.m4
index be4ce86..3958e71 100644
--- a/am/readline.m4
+++ b/am/readline.m4
@@ -16,7 +16,7 @@ AC_DEFUN([gl_FUNC_READLINE],
 
   dnl Allow disabling the use of libreadline.
   AC_ARG_ENABLE([readline],
-    AC_HELP_STRING([--disable-readline],
+    AS_HELP_STRING([--disable-readline],
 		   [do not build against libreadline]), ,
     [enable_readline=yes])
 
diff --git a/configure.ac b/configure.ac
index 4fe029c..5ebc4d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,10 +26,10 @@ AC_INIT([GNU inetutils],
 
 AC_CONFIG_SRCDIR([src/inetd.c])
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_HEADER([config.h:config.hin])
+AC_CONFIG_HEADERS([config.h:config.hin])
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.11.1 dist-xz])
+AM_INIT_AUTOMAKE([1.11.1 dist-xz -Wall -Werror])
 
 # For now, we always use libexecdir; later we may want to vary where
 # the daemons go.
@@ -37,40 +37,40 @@ inetdaemondir='$(libexecdir)'
 AC_SUBST(inetdaemondir)
 
 AC_ARG_WITH([krb4],
-            AC_HELP_STRING([--with-krb4[[=PATH]]],
+            AS_HELP_STRING([--with-krb4[[=PATH]]],
                            [Compile with Kerberos IV]),
             [KERBEROS_VERSION=krb4
              KERBEROS_DIR=$withval])
 AC_ARG_WITH([krb5],
-            AC_HELP_STRING([--with-krb5[[=PATH]]],
+            AS_HELP_STRING([--with-krb5[[=PATH]]],
                            [Compile with Kerberos V]),
             [KERBEROS_VERSION=krb5
              KERBEROS_DIR=$withval])
 AC_ARG_WITH([shishi],
-            AC_HELP_STRING([--with-shishi[[=PATH]]],
+            AS_HELP_STRING([--with-shishi[[=PATH]]],
 		           [Compile with Shishi (Kerberos 5)]),
             [KERBEROS_VERSION=Shishi
              KERBEROS_DIR=$withval])
 
 AC_ARG_ENABLE([servers],
-              AC_HELP_STRING([--disable-servers],
+              AS_HELP_STRING([--disable-servers],
                              [Do not compile servers]),
 	      , [enable_servers=yes])
 AC_ARG_ENABLE([clients],
-              AC_HELP_STRING([--disable-clients],
+              AS_HELP_STRING([--disable-clients],
                              [Do not compile clients]),
 	      , [enable_clients=yes])
 AC_ARG_ENABLE([libls],
-              AC_HELP_STRING([--disable-libls],
+              AS_HELP_STRING([--disable-libls],
                              [Disable support for libls ]),
               , [enable_libls=yes])
 AC_ARG_ENABLE([encryption],
-              AC_HELP_STRING([--enable-encryption],
+              AS_HELP_STRING([--enable-encryption],
                              [Enable encryption]),
               [test -z "$KERBEROS_VERSION" && AC_MSG_ERROR([--enable-encryption is given, but a Kerberos version is not provided])],
               [test -z "$KERBEROS_VERSION" && enable_encryption=no])
 AC_ARG_ENABLE([authentication],
-              AC_HELP_STRING([--enable-authentication],
+              AS_HELP_STRING([--enable-authentication],
                              [Enable connection authentication]),
               [test -z "$KERBEROS_VERSION" && AC_MSG_ERROR([--enable-authentication is given, but a Kerberos version is not provided])],
 	      [test -z "$KERBEROS_VERSION" && enable_authentication=no])
@@ -81,17 +81,17 @@ if test -n "$KERBEROS_VERSION"; then
 fi
 
 AC_ARG_WITH([wrap],
-            AC_HELP_STRING([--with-wrap],
+            AS_HELP_STRING([--with-wrap],
                            [Add tcp wrapper support]))
 AC_ARG_WITH([pam],
-            AC_HELP_STRING([--with-pam],
+            AS_HELP_STRING([--with-pam],
                            [Add support for PAM]))
 AC_ARG_WITH([idn],
-  AC_HELP_STRING([--with-idn[[=DIR]]],
+  AS_HELP_STRING([--with-idn[[=DIR]]],
 		 [Use IDN support, with optional inclusion directory]), ,
 		 [with_idn=no])
 AC_ARG_WITH([libidn-prefix],
-  AC_HELP_STRING([--with-libidn-prefix[[=DIR]]],
+  AS_HELP_STRING([--with-libidn-prefix[[=DIR]]],
 		 [Base directory, probes DIR/include and DIR/lib]), ,
 		 [with_libidn_prefix=no])
 
@@ -123,8 +123,6 @@ IU_ENABLE_CLIENT(whois)
 IU_ENABLE_CLIENT(ifconfig)
 IU_ENABLE_CLIENT(traceroute)
 
-AM_INIT_AUTOMAKE
-
 AM_SILENT_RULES([yes])
 
 AC_ISC_POSIX
@@ -132,6 +130,7 @@ AC_ISC_POSIX
 ### Checks for programs.
 AC_PROG_CC
 gl_EARLY
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 AC_CHECK_TOOL(AR, ar)
 AC_PATH_PROG(DD, dd, dd)
 AC_PATH_PROG(MKTEMP, mktemp, mktemp)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |   14 ++++++++++++++
 am/config_paths.m4 |    2 +-
 am/libcurses.m4    |    4 ++--
 am/readline.m4     |    2 +-
 configure.ac       |   31 +++++++++++++++----------------
 5 files changed, 33 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue May 07 21:27:08 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UZt9w-0001GI-7L
	for mharc-commit-inetutils@gnu.org; Tue, 07 May 2013 21:27:08 -0400
Received: from eggs.gnu.org ([208.118.235.92]:42272)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UZt9o-0001G8-LU
	for commit-inetutils@gnu.org; Tue, 07 May 2013 21:27:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UZt9i-0007uG-8D
	for commit-inetutils@gnu.org; Tue, 07 May 2013 21:27:00 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48569)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UZt9i-0007u8-49
	for commit-inetutils@gnu.org; Tue, 07 May 2013 21:26:54 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1UZt9h-000141-Kt
	for commit-inetutils@gnu.org; Wed, 08 May 2013 01:26:53 +0000
Date: Wed, 08 May 2013 01:26:53 +0000
Message-Id: <E1UZt9h-000141-Kt@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-282-ge854134
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b997ed983b4bf6e71a1f6419fe384c8f62e0004d
X-Git-Newrev: e854134ba2470c111532a8509d6780d99d486f1d
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 May 2013 01:27:07 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  e854134ba2470c111532a8509d6780d99d486f1d (commit)
      from  b997ed983b4bf6e71a1f6419fe384c8f62e0004d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=e854134ba2470c111532a8509d6780d99d486f1d


commit e854134ba2470c111532a8509d6780d99d486f1d
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed May 8 00:16:51 2013 +0200

    libtelnet: Parity adjust non-DES key.

diff --git a/ChangeLog b/ChangeLog
index d40358d..a6c8fab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2013-05-08  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	libtelnet: Parity adjust non-DES key.
+
+	* libtelnet/enc_des.c (des_parity, des_check_parity)
+	(des_set_parity) [AUTHENTICATION && ENCRYPTION]
+	[DES_ENCRYPTION || SHISHI]: New static functions.
+	(fb64_session) [AUTHENTICATION && ENCRYPTION]:
+	New variables OFFSET and DERIVED_KEY.  Accept keys
+	of type SK_OTHER and adjust parity in a partitioned
+	copy of the authentication key, as RFC 2952 suggests.
+
+	Self-documenting array length.
+
+	* libtelnet/enc_des.c (shishi_des_ecb_encrypt)
+	[AUTHENTICATION && ENCRYPTION && SHISHI]:
+	Use sizeof(Block) as array size.
+	(fb64_start) [AUTHENTICATION && ENCRYPTION && SHISHI]:
+	Likewise.
+
 2013-05-07  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	configure.ac: Minor clean-up.
diff --git a/libtelnet/enc_des.c b/libtelnet/enc_des.c
index 614e7c9..99450d9 100644
--- a/libtelnet/enc_des.c
+++ b/libtelnet/enc_des.c
@@ -51,7 +51,7 @@
 
 #ifdef	ENCRYPTION
 # ifdef	AUTHENTICATION
-# if defined DES_ENCRYPTION || defined SHISHI
+#  if defined DES_ENCRYPTION || defined SHISHI
 #   ifdef SHISHI
 #    include <shishi.h>
 extern Shishi *shishi_handle;
@@ -143,17 +143,19 @@ static int fb64_reply (unsigned char *, int, struct fb *);
 static void fb64_session (Session_Key *, int, struct fb *);
 static void fb64_stream_key (Block, struct stinfo *);
 static int fb64_keyid (int, unsigned char *, int *, struct fb *);
+static int des_check_parity (Block b);
+static int des_set_parity (Block b);
 
 #   ifdef SHISHI
 static void
-shishi_des_ecb_encrypt (Shishi * h, const unsigned char key[8],
+shishi_des_ecb_encrypt (Shishi * h, const unsigned char key[sizeof (Block)],
 			const unsigned char *in, unsigned char *out)
 {
   char *tmp;
 
   shishi_des (h, 0, (const char *) key, NULL, NULL,
-	      (const char *) in, 8, &tmp);
-  memcpy (out, tmp, 8);
+	      (const char *) in, sizeof (Block), &tmp);
+  memcpy (out, tmp, sizeof (Block));
   free (tmp);
 }
 #   endif
@@ -251,7 +253,8 @@ fb64_start (struct fb *fbp, int dir, int server)
        * Create a random feed and send it over.
        */
 #   ifdef SHISHI
-      if (shishi_randomize (shishi_handle, 0, fbp->temp_feed, 8) != SHISHI_OK)
+      if (shishi_randomize (shishi_handle, 0,
+			    fbp->temp_feed, sizeof (Block)) != SHISHI_OK)
 	return (FAILED);
 
 #   else
@@ -316,13 +319,13 @@ fb64_is (unsigned char *data, int cnt, struct fb *fbp)
       if (cnt != sizeof (Block))
 	{
 	  if (encrypt_debug_mode)
-	    printf ("CFB64: initial vector failed on size\r\n");
+	    printf ("FB64: initial vector failed on size\r\n");
 	  state = FAILED;
 	  goto failure;
 	}
 
       if (encrypt_debug_mode)
-	printf ("CFB64: initial vector received\r\n");
+	printf ("FB64: initial vector received\r\n");
 
       if (encrypt_debug_mode)
 	printf ("Initializing Decrypt stream\r\n");
@@ -452,21 +455,54 @@ ofb64_session (Session_Key *key, int server)
 static void
 fb64_session (Session_Key *key, int server, struct fb *fbp)
 {
+  size_t offset;
+  unsigned char *derived_key;
 
   if (!key || key->type != SK_DES)
     {
       /* FIXME: Support RFC 2952 approach instead of giving up here. */
       if (encrypt_debug_mode)
-	printf ("Can't set krbdes's session key (%d != %d)\r\n",
+	printf ("Received non-DES session key (%d != %d)\r\n",
 		key ? key->type : -1, SK_DES);
-      return;	/* XXX: Causes a segfault.  */
+      if (!key)
+	return;	/* XXX: Causes a segfault, since *key is NULL.  */
+
+      /* Follow RFC 2952 in using the authentication key
+       * to derived one or more DES-keys, after adjusting
+       * the parity in each eight byte block.
+       */
     }
 
-  memmove ((void *) fbp->krbdes_key, (void *) key->data, sizeof (Block));
+  /* Make a copy of the authentication key,
+   * since the parity might need mending.  */
+  derived_key = malloc (key->length);
+  if (!derived_key)
+    return;	/* Still destructive, but no alternate method in sight.  */
+
+  memmove ((void *) derived_key, (void *) key->data, key->length);
 
+  /* Check parity of each DES block, correct it whenever needed.  */
+  for (offset = 0; offset < key->length; offset += sizeof (Block))
+    (void) des_set_parity (derived_key + offset);
+
+  /* XXX: A single key block is in use for now,
+   *      but all block are of correct parity.
+   *      krbdes_key should be an array of block,
+   *      which each encryption method may use at
+   *      it own discretion.  This is the content
+   *      if RFC 2946 and 2952, etcetera.
+   */
+  memmove ((void *) fbp->krbdes_key, (void *) derived_key, sizeof (Block));
+
+  /* XXX: These should at least be split according
+   *      to direction and role, i.e., client or server.
+   */
   fb64_stream_key (fbp->krbdes_key, &fbp->streams[DIR_ENCRYPT - 1]);
   fb64_stream_key (fbp->krbdes_key, &fbp->streams[DIR_DECRYPT - 1]);
 
+  /* Erase sensitive key material.  */
+  memset (derived_key, 0, key->length);
+
   if (fbp->once == 0)
     {
 #   ifndef SHISHI
@@ -789,6 +825,51 @@ ofb64_decrypt (int data)
   return (data ^ stp->str_feed[index]);
 }
 #   endif /* ENCTYPE_DES_OFB64 */
-#  endif /* DES_ENCRYPTION */
+
+static int
+des_parity (Block b, int adjust)
+{
+  size_t index;
+  int adj = 0;
+
+  for (index = 0; index < sizeof (Block); index++)
+    {
+      unsigned char c = b[index];
+
+      c ^= (c >> 4);
+      c ^= (c >> 2);
+      c ^= (c >> 1);
+
+      if (!(c & 1))
+	{
+	  /* Even parity.  */
+	  adj++;
+	  if (adjust)
+	    *(&b[index]) ^= 0x01;
+	}
+    }
+
+  return adj;
+}
+
+/*
+ * Returns:
+ *	 0: Correct parity in full key block.
+ *	 n: Count of corrected bytes.
+ */
+
+static int
+des_check_parity (Block b)
+{
+  return des_parity (b, 0);
+}
+
+static int
+des_set_parity (Block b)
+{
+  return des_parity (b, 1);
+}
+
+#  endif /* DES_ENCRYPTION || SHISHI */
 # endif	/* AUTHENTICATION */
 #endif /* ENCRYPTION */

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |   20 ++++++++++
 libtelnet/enc_des.c |  103 +++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 112 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon May 13 18:10:13 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uc0wf-0004Lf-1M
	for mharc-commit-inetutils@gnu.org; Mon, 13 May 2013 18:10:13 -0400
Received: from eggs.gnu.org ([208.118.235.92]:37986)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uc0wa-0004I5-Dq
	for commit-inetutils@gnu.org; Mon, 13 May 2013 18:10:11 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uc0wY-0006DY-Hv
	for commit-inetutils@gnu.org; Mon, 13 May 2013 18:10:08 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:33771)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uc0wY-0006DN-Es
	for commit-inetutils@gnu.org; Mon, 13 May 2013 18:10:06 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1Uc0wX-000458-Cj
	for commit-inetutils@gnu.org; Mon, 13 May 2013 22:10:05 +0000
Date: Mon, 13 May 2013 22:10:05 +0000
Message-Id: <E1Uc0wX-000458-Cj@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-285-gd6a64f4
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e854134ba2470c111532a8509d6780d99d486f1d
X-Git-Newrev: d6a64f4ff8444c697b18eedade1bf2b8ac3a0f71
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 May 2013 22:10:11 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  d6a64f4ff8444c697b18eedade1bf2b8ac3a0f71 (commit)
       via  4d72a588c2f1e269d1ca4564f1255392db2311d7 (commit)
       via  62db12b9cc52a9bece74744b6789d790bb8e6916 (commit)
      from  e854134ba2470c111532a8509d6780d99d486f1d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=d6a64f4ff8444c697b18eedade1bf2b8ac3a0f71


commit d6a64f4ff8444c697b18eedade1bf2b8ac3a0f71
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon May 13 19:08:29 2013 +0200

    libtelnet: Availability of DES_OFB64.
    
    Declare properly that our code base supports DES_CFB64
    as well as DES_OFB64.  This prevents the system specific
    header to arrange matters otherwise.

diff --git a/ChangeLog b/ChangeLog
index 4626c55..90bbef2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
 2013-05-13  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	libtelnet: Make availibility of DES_OFB64 in addition
+	to DES_CFB64 independent of host system.
+
+	* libtelnet/encryption.h (ENCTYPE_DES_OFB64)
+	[ENCRYPTION]: Define if missing.
+	(ENCTYPE_CNT, ENCTYPE_NAME_OK) [ENCRYPTION]:
+	Always redefine.
+
+	* libtelnet/encryption.c [ENCRYPTION]: Undefine
+	ENCRYPT_NAMES before including <arpa/telnet.h>.
+	(enctype_names) [ENCRYPTION]: New array variable.
+	(encrypt_is, encrypt_reply, encrypt_start) [ENCRYPTION]:
+	Before printing encryption type, check that ENCTYPE_NAME()
+	is non-null in addition to checking only ENCTYPE_NAME_OK().
+
+	* telnet/utilities.c (printsub) [ENCRYPTION]: Likewise.
+	* telnetd/utility.c (printsub) [ENCRYPTION]: Likewise.
+
+2013-05-13  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	* configure.ac <*olaris*>: New test for subcase
 	`*olaris*11'.  Define SOLARIS11 for matches.
 
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index b55aa9b..c67e61b 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -71,7 +71,7 @@
 
 #ifdef	ENCRYPTION
 
-# define ENCRYPT_NAMES
+# undef ENCRYPT_NAMES		/* Ignore enctype_names[].  */
 # include <arpa/telnet.h>
 
 # include "encrypt.h"
@@ -83,6 +83,13 @@
 # include <stdio.h>
 # include "genget.h"
 
+/* String representation of our capabilities.
+ * Solaris will gain DES_OFB64!
+ */
+char *enctype_names[] = {
+  "ANY", "DES_CFB64", "DES_OFB64", 0,
+};
+
 /* Callback from consumer.  */
 extern void printsub (char, unsigned char *, int);
 
@@ -565,7 +572,7 @@ encrypt_is (unsigned char *data, int cnt)
       if (encrypt_debug_mode)
 	printf (">>>%s: Can't find type %s (%d) for initial negotiation\r\n",
 		Name,
-		ENCTYPE_NAME_OK (type)
+		ENCTYPE_NAME_OK (type) && ENCTYPE_NAME (type)
 		? ENCTYPE_NAME (type) : "(unknown)", type);
       return;
     }
@@ -574,7 +581,7 @@ encrypt_is (unsigned char *data, int cnt)
       if (encrypt_debug_mode)
 	printf (">>>%s: No initial negotiation needed for type %s (%d)\r\n",
 		Name,
-		ENCTYPE_NAME_OK (type)
+		ENCTYPE_NAME_OK (type) && ENCTYPE_NAME (type)
 		? ENCTYPE_NAME (type) : "(unknown)", type);
       ret = 0;
     }
@@ -610,7 +617,7 @@ encrypt_reply (unsigned char *data, int cnt)
       if (encrypt_debug_mode)
 	printf (">>>%s: Can't find type %s (%d) for initial negotiation\r\n",
 		Name,
-		ENCTYPE_NAME_OK (type)
+		ENCTYPE_NAME_OK (type) && ENCTYPE_NAME (type)
 		? ENCTYPE_NAME (type) : "(unknown)", type);
       return;
     }
@@ -619,7 +626,7 @@ encrypt_reply (unsigned char *data, int cnt)
       if (encrypt_debug_mode)
 	printf (">>>%s: No initial negotiation needed for type %s (%d)\r\n",
 		Name,
-		ENCTYPE_NAME_OK (type)
+		ENCTYPE_NAME_OK (type) && ENCTYPE_NAME (type)
 		? ENCTYPE_NAME (type) : "(unknown)", type);
       ret = 0;
     }
@@ -679,7 +686,7 @@ encrypt_start (unsigned char *data, int cnt)
     {
       printf ("%s: Warning, Cannot decrypt type %s (%d)!!!\r\n",
 	      Name,
-	      ENCTYPE_NAME_OK (decrypt_mode)
+	      ENCTYPE_NAME_OK (decrypt_mode) && ENCTYPE_NAME (decrypt_mode)
 	      ? ENCTYPE_NAME (decrypt_mode) : "(unknown)", decrypt_mode);
       encrypt_send_request_end ();
     }
@@ -861,7 +868,7 @@ encrypt_start_output (int type)
 	{
 	  printf (">>>%s: Can't encrypt with type %s (%d)\r\n",
 		  Name,
-		  ENCTYPE_NAME_OK (type)
+		  ENCTYPE_NAME_OK (type) && ENCTYPE_NAME (type)
 		  ? ENCTYPE_NAME (type) : "(unknown)", type);
 	}
       return;
diff --git a/libtelnet/encrypt.h b/libtelnet/encrypt.h
index 444826f..f65b18f 100644
--- a/libtelnet/encrypt.h
+++ b/libtelnet/encrypt.h
@@ -88,6 +88,22 @@
 #   define ENCTYPE_CNT TELOPT_ENCTYPE_CNT
 #  endif
 
+/*
+ * Our capabilities are restricted to the encryption types
+ * DES_CFB64 and DES_OFB64.  The latter type is sometimes
+ * missing in <arpa/telnet.h>.  On the other hand, the same
+ * header file may indicate more encryption types than are
+ * supported by the present code.
+ */
+#  ifndef ENCTYPE_DES_OFB64
+#   define ENCTYPE_DES_OFB64	2	/* RFC 2953 */
+#  endif
+#  undef ENCTYPE_CNT
+#  define ENCTYPE_CNT	3		/* Up to DES_OFB64.  */
+
+#  undef ENCTYPE_NAME_OK
+#  define ENCTYPE_NAME_OK(x)	((unsigned int)(x) < ENCTYPE_CNT)
+
 typedef unsigned char Block[8];
 typedef unsigned char *BlockT;
 
diff --git a/telnet/utilities.c b/telnet/utilities.c
index f97646b..d3320fd 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -597,7 +597,7 @@ printsub (char direction, unsigned char *pointer, int length)
 		  fprintf (NetTrace, " (partial suboption??\?)");
 		  break;
 		}
-	      if (ENCTYPE_NAME_OK (pointer[2]))
+	      if (ENCTYPE_NAME_OK (pointer[2]) && ENCTYPE_NAME (pointer[2]))
 		fprintf (NetTrace, "%s ", ENCTYPE_NAME (pointer[2]));
 	      else
 		fprintf (NetTrace, " %d (unknown)", pointer[2]);
@@ -611,7 +611,7 @@ printsub (char direction, unsigned char *pointer, int length)
 	      fprintf (NetTrace, " SUPPORT ");
 	      while (i < length)
 		{
-		  if (ENCTYPE_NAME_OK (pointer[i]))
+		  if (ENCTYPE_NAME_OK (pointer[i]) && ENCTYPE_NAME (pointer[i]))
 		    fprintf (NetTrace, "%s ", ENCTYPE_NAME (pointer[i]));
 		  else
 		    fprintf (NetTrace, "%d ", pointer[i]);
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 4e669b7..da16788 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -1503,7 +1503,7 @@ printsub (int direction, unsigned char *pointer, int length)
 	      debug_output_data (" (partial suboption??\?)");
 	      break;
 	    }
-	  if (ENCTYPE_NAME_OK (pointer[2]))
+	  if (ENCTYPE_NAME_OK (pointer[2]) && ENCTYPE_NAME (pointer[2]))
 	    debug_output_data ("%s ", ENCTYPE_NAME (pointer[2]));
 	  else
 	    debug_output_data (" %d (unknown)", pointer[2]);
@@ -1517,7 +1517,7 @@ printsub (int direction, unsigned char *pointer, int length)
 	  debug_output_data (" SUPPORT ");
 	  while (i < length)
 	    {
-	      if (ENCTYPE_NAME_OK (pointer[i]))
+	      if (ENCTYPE_NAME_OK (pointer[i]) && ENCTYPE_NAME (pointer[i]))
 		debug_output_data ("%s ", ENCTYPE_NAME (pointer[i]));
 	      else
 		debug_output_data ("%d ", pointer[i]);

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=4d72a588c2f1e269d1ca4564f1255392db2311d7


commit 4d72a588c2f1e269d1ca4564f1255392db2311d7
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon May 13 00:11:15 2013 +0200

    Login fixes for Solaris.

diff --git a/ChangeLog b/ChangeLog
index 9e31c44..4626c55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-05-13  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* configure.ac <*olaris*>: New test for subcase
+	`*olaris*11'.  Define SOLARIS11 for matches.
+
+	* telnetd/telnetd.c (login_invocation)
+	[SOLARIS && SOLARIS11]: Add `-p' to old value.
+
+	* src/rlogind.c (exec_login) <authenticated>
+	[SOLARIS]: Change service to `-s krlogin' in
+	argument list to execle().
+
 2013-05-09  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* src/logger.c (parse_level): Rename PRI to PRIO,
diff --git a/configure.ac b/configure.ac
index 5ebc4d2..ac95660 100644
--- a/configure.ac
+++ b/configure.ac
@@ -943,7 +943,7 @@ AH_BOTTOM(
 # entry in utmpx.  Also for some OS they are better handled with
 # STREAMS.
 case "$host" in
-*-freebsd9* | *-freebsd10*)
+*-freebsd9* | *-freebsd10* )
   # FreeBSD 9.0 has implemented a non-standard and singular
   # UTMPX interface.  The readutmp module from GNUlib does
   # not support it, but we can fall back to getutxuser() for
@@ -953,7 +953,15 @@ case "$host" in
   #
   # Other issues?
   ;;
-*olaris*)
+*olaris* )
+  case "$host" in
+  *olaris*11 )
+    AC_DEFINE([SOLARIS11], 1, [OpenSolaris and newer Solaris.])
+    ;;
+  * )
+    # Older Solaris variants.
+    ;;
+  esac
   AC_DEFINE([SOLARIS], 1, [FIXME])
   AC_DEFINE([HAVE_STREAMSPTY], 1, [FIXME])
   ;;
diff --git a/src/rlogind.c b/src/rlogind.c
index 19525e4..70581ab 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -1119,7 +1119,7 @@ exec_login (int authenticated, struct auth_data *ap)
   if (authenticated)
     {
 #ifdef SOLARIS
-      execle (path_login, "login", "-p", "-s", "rlogin",
+      execle (path_login, "login", "-p", "-s", "krlogin",
 	      "-r", ap->hostname, "-U", ap->rusername,
 	      ap->lusername, NULL, ap->env);
 #else
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 3dfec8d..f7886f3 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -46,9 +46,11 @@ static void print_hostinfo (void);
 /* Template command line for invoking login program */
 
 char *login_invocation =
-#ifdef SOLARIS
+#ifdef SOLARIS11
+  PATH_LOGIN " -p -h %h %?T{-t %T} %?u{-u %u}"
+#elif defined SOLARIS
   PATH_LOGIN " -h %h %?T{-t %T} %?u{-u %u}"
-#else
+#else /* !SOLARIS */
   PATH_LOGIN " -p -h %h %?u{-f %u}"
 #endif
   ;

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=62db12b9cc52a9bece74744b6789d790bb8e6916


commit 62db12b9cc52a9bece74744b6789d790bb8e6916
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu May 9 23:32:37 2013 +0200

    logger: Default priority.

diff --git a/ChangeLog b/ChangeLog
index a6c8fab..9e31c44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-09  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* src/logger.c (parse_level): Rename PRI to PRIO,
+	so as not to shadow the global variable.  Initiate
+	value to LOG_NOTICE, not to LOG_EMERG.
+
 2013-05-08  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	libtelnet: Parity adjust non-DES key.
diff --git a/src/logger.c b/src/logger.c
index 6da5b84..957843d 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -52,7 +52,7 @@
 
 static char *tag = NULL;
 static int logflags = 0;
-static int pri = MAKE_PRI (LOG_USER, LOG_NOTICE);
+static int pri = MAKE_PRI (LOG_USER, LOG_NOTICE);  /* Cf. parse_level */
 /* Only one of `host' and `unixsock' will be non-NULL
  * once option parsing has been completed. */
 static char *host = PATH_LOG;
@@ -106,7 +106,7 @@ int
 parse_level (char *str)
 {
   char *p;
-  int fac, pri = 0;
+  int fac, prio = LOG_NOTICE;	/* Default priority!  */
 
   p = strchr (str, '.');
   if (p)
@@ -114,8 +114,9 @@ parse_level (char *str)
 
   fac = decode (str, facilitynames, "facility");
   if (p)
-    pri = decode (p, prioritynames, "priority");
-  return MAKE_PRI (fac, pri);
+    prio = decode (p, prioritynames, "priority");
+
+  return MAKE_PRI (fac, prio);
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |   38 ++++++++++++++++++++++++++++++++++++++
 configure.ac        |   12 ++++++++++--
 libtelnet/encrypt.c |   21 ++++++++++++++-------
 libtelnet/encrypt.h |   16 ++++++++++++++++
 src/logger.c        |    9 +++++----
 src/rlogind.c       |    2 +-
 telnet/utilities.c  |    4 ++--
 telnetd/telnetd.c   |    6 ++++--
 telnetd/utility.c   |    4 ++--
 9 files changed, 92 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue May 14 11:31:06 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UcHBy-0001K6-QT
	for mharc-commit-inetutils@gnu.org; Tue, 14 May 2013 11:31:06 -0400
Received: from eggs.gnu.org ([208.118.235.92]:51997)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UcHBs-0001IE-FE
	for commit-inetutils@gnu.org; Tue, 14 May 2013 11:31:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UcHBp-00059X-4k
	for commit-inetutils@gnu.org; Tue, 14 May 2013 11:31:00 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37699)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UcHBp-00059T-0D
	for commit-inetutils@gnu.org; Tue, 14 May 2013 11:30:57 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1UcHBo-0006zq-KB
	for commit-inetutils@gnu.org; Tue, 14 May 2013 15:30:56 +0000
Date: Tue, 14 May 2013 15:30:56 +0000
Message-Id: <E1UcHBo-0006zq-KB@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-286-g3864a49
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d6a64f4ff8444c697b18eedade1bf2b8ac3a0f71
X-Git-Newrev: 3864a49a23d70caddedddd4a52ed10ee443ee192
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 May 2013 15:31:05 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  3864a49a23d70caddedddd4a52ed10ee443ee192 (commit)
      from  d6a64f4ff8444c697b18eedade1bf2b8ac3a0f71 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=3864a49a23d70caddedddd4a52ed10ee443ee192


commit 3864a49a23d70caddedddd4a52ed10ee443ee192
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue May 14 17:26:43 2013 +0200

    libtelnet: Check authentication name strings.
    
    The list of authentication names is allowed
    to set NULL for missing methods.  Protect
    against dereferencing such null-pointers.

diff --git a/ChangeLog b/ChangeLog
index 90bbef2..584f857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2013-05-14  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	libtelnet: The list of authentication names is
+	allowed to contain NULL entries.  Prevent access
+	to such entries.
+
+	* libtelnet/auth.c: Position some assignments before
+	the corresponding if-statement.
+	(auth_init) [AUTHENTICATION]: Check that AUTHTYPE_NAME()
+	is non-NULL before referencing it.
+	(auth_disable_name, getauthmask, auth_onoff, auth_send)
+	[AUTHENTICATION]: Likewise.
+
+	* telnet/utilities.c (printsub) [AUTHENTICATION]: Likewise.
+	* telnetd/utility.c (printsub) [AUTHENTICATION]: Likewise.
+
 2013-05-13  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	libtelnet: Make availibility of DES_OFB64 in addition
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index 9e5a61b..e697bb2 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -255,13 +255,11 @@ auth_init (char *name, int server)
 	  if (auth_debug_mode)
 	    printf (">>>%s: I support auth type %s (%d) %s (%d)\r\n",
 		    Name,
-		    AUTHTYPE_NAME_OK (ap->type) ?
-		    AUTHTYPE_NAME (ap->type) :
-		    "unknown",
+		    (AUTHTYPE_NAME_OK (ap->type) && AUTHTYPE_NAME (ap->type))
+		    ? AUTHTYPE_NAME (ap->type) : "unknown",
 		    ap->type,
-		    ap->way &
-		    AUTH_HOW_MASK &
-		    AUTH_HOW_MUTUAL ? "MUTUAL" : "ONEWAY", ap->way);
+		    (ap->way & AUTH_HOW_MASK & AUTH_HOW_MUTUAL)
+		    ? "MUTUAL" : "ONEWAY", ap->way);
 	}
       else if (auth_debug_mode)
 	printf (">>>%s: Init failed: auth type %d %d\r\n",
@@ -277,7 +275,7 @@ auth_disable_name (char *name)
 
   for (x = 0; x < AUTHTYPE_CNT; ++x)
     {
-      if (!strcasecmp (name, AUTHTYPE_NAME (x)))
+      if (AUTHTYPE_NAME (x) && !strcasecmp (name, AUTHTYPE_NAME (x)))
 	{
 	  i_wont_support |= typemask (x);
 	  break;
@@ -290,7 +288,7 @@ getauthmask (char *type, int *maskp)
 {
   register int x;
 
-  if (!strcasecmp (type, AUTHTYPE_NAME (0)))
+  if (AUTHTYPE_NAME (0) && !strcasecmp (type, AUTHTYPE_NAME (0)))
     {
       *maskp = -1;
       return (1);
@@ -298,7 +296,7 @@ getauthmask (char *type, int *maskp)
 
   for (x = 1; x < AUTHTYPE_CNT; ++x)
     {
-      if (!strcasecmp (type, AUTHTYPE_NAME (x)))
+      if (AUTHTYPE_NAME (x) && !strcasecmp (type, AUTHTYPE_NAME (x)))
 	{
 	  *maskp = typemask (x);
 	  return (1);
@@ -335,7 +333,8 @@ auth_onoff (char *type, int on)
       mask = 0;
       for (ap = authenticators; ap->type; ap++)
 	{
-	  if ((mask & (i = typemask (ap->type))) != 0)
+	  i = typemask (ap->type);
+	  if ((mask & i) != 0)
 	    continue;
 	  mask |= i;
 	  printf ("\t%s\n", AUTHTYPE_NAME (ap->type));
@@ -380,7 +379,8 @@ auth_status ()
   mask = 0;
   for (ap = authenticators; ap->type; ap++)
     {
-      if ((mask & (i = typemask (ap->type))) != 0)
+      i = typemask (ap->type);
+      if ((mask & i) != 0)
 	continue;
       mask |= i;
       printf ("%s: %s\n", AUTHTYPE_NAME (ap->type),
@@ -487,13 +487,14 @@ auth_send (unsigned char *data, int cnt)
     {
       if (auth_debug_mode)
 	printf (">>>%s: He supports %s (%d) %s (%d)\r\n",
-		Name, AUTHTYPE_NAME_OK (auth_send_data[0]) ?
-		AUTHTYPE_NAME (auth_send_data[0]) :
-		"unknown",
+		Name,
+		(AUTHTYPE_NAME_OK (auth_send_data[0])
+		 && AUTHTYPE_NAME (auth_send_data[0]))
+		? AUTHTYPE_NAME (auth_send_data[0]) : "unknown",
 		auth_send_data[0],
-		auth_send_data[1] &
-		AUTH_HOW_MASK &
-		AUTH_HOW_MUTUAL ? "MUTUAL" : "ONEWAY", auth_send_data[1]);
+		(auth_send_data[1] & AUTH_HOW_MASK & AUTH_HOW_MUTUAL)
+		? "MUTUAL" : "ONEWAY",
+		auth_send_data[1]);
       if ((i_support & ~i_wont_support) & typemask (*auth_send_data))
 	{
 	  ap = findauthenticator (auth_send_data[0], auth_send_data[1]);
@@ -502,14 +503,13 @@ auth_send (unsigned char *data, int cnt)
 	      if (auth_debug_mode)
 		printf (">>>%s: Trying %s (%d) %s (%d)\r\n",
 			Name,
-			AUTHTYPE_NAME_OK (auth_send_data[0]) ?
-			AUTHTYPE_NAME (auth_send_data[0]) :
-			"unknown",
+			(AUTHTYPE_NAME_OK (auth_send_data[0])
+			 && AUTHTYPE_NAME (auth_send_data[0]))
+			? AUTHTYPE_NAME (auth_send_data[0]) : "unknown",
 			auth_send_data[0],
-			auth_send_data[1] &
-			AUTH_HOW_MASK &
-			AUTH_HOW_MUTUAL ?
-			"MUTUAL" : "ONEWAY", auth_send_data[1]);
+			(auth_send_data[1] & AUTH_HOW_MASK & AUTH_HOW_MUTUAL)
+			? "MUTUAL" : "ONEWAY",
+			auth_send_data[1]);
 	      if ((*ap->send) (ap))
 		{
 		  /*
@@ -520,9 +520,10 @@ auth_send (unsigned char *data, int cnt)
 		  if (auth_debug_mode)
 		    printf (">>>%s: Using type %s (%d)\r\n",
 			    Name,
-			    AUTHTYPE_NAME_OK (*auth_send_data) ?
-			    AUTHTYPE_NAME (*auth_send_data) :
-			    "unknown", *auth_send_data);
+			    (AUTHTYPE_NAME_OK (*auth_send_data)
+			     && AUTHTYPE_NAME (*auth_send_data))
+			    ? AUTHTYPE_NAME (*auth_send_data) : "unknown",
+			    *auth_send_data);
 		  auth_send_data += 2;
 		  return;
 		}
@@ -573,7 +574,8 @@ auth_is (unsigned char *data, int cnt)
       return;
     }
 
-  if (ap = findauthenticator (data[0], data[1]))
+  ap = findauthenticator (data[0], data[1]);
+  if (ap)
     {
       if (ap->is)
 	(*ap->is) (ap, data + 2, cnt - 2);
@@ -590,7 +592,8 @@ auth_reply (unsigned char *data, int cnt)
   if (cnt < 2)
     return;
 
-  if (ap = findauthenticator (data[0], data[1]))
+  ap = findauthenticator (data[0], data[1]);
+  if (ap)
     {
       if (ap->reply)
 	(*ap->reply) (ap, data + 2, cnt - 2);
@@ -652,8 +655,11 @@ auth_finished (TN_Authenticator * ap, int result)
 {
   if (ap && ap->cleanup)
     (*ap->cleanup) (ap);
-  if (!(authenticated = ap))
+
+  authenticated = ap;
+  if (!authenticated)
     authenticated = &NoAuth;
+
   validuser = result;
 }
 
@@ -729,7 +735,8 @@ auth_printsub (unsigned char *data, int cnt, unsigned char *buf, int buflen)
 {
   TN_Authenticator *ap;
 
-  if ((ap = findauthenticator (data[1], data[2])) && ap->printsub)
+  ap = findauthenticator (data[1], data[2]);
+  if (ap && ap->printsub)
     (*ap->printsub) (data, cnt, buf, buflen);
   else
     auth_gen_printsub (data, cnt, buf, buflen);
diff --git a/telnet/utilities.c b/telnet/utilities.c
index d3320fd..5184eb5 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -504,7 +504,7 @@ printsub (char direction, unsigned char *pointer, int length)
 	    case TELQUAL_IS:
 	      fprintf (NetTrace, " %s ",
 		       (pointer[1] == TELQUAL_IS) ? "IS" : "REPLY");
-	      if (AUTHTYPE_NAME_OK (pointer[2]))
+	      if (AUTHTYPE_NAME_OK (pointer[2]) && AUTHTYPE_NAME (pointer[2]))
 		fprintf (NetTrace, "%s ", AUTHTYPE_NAME (pointer[2]));
 	      else
 		fprintf (NetTrace, "%d ", pointer[2]);
@@ -528,7 +528,8 @@ printsub (char direction, unsigned char *pointer, int length)
 	      fprintf (NetTrace, " SEND ");
 	      while (i < length)
 		{
-		  if (AUTHTYPE_NAME_OK (pointer[i]))
+		  if (AUTHTYPE_NAME_OK (pointer[i])
+		      && AUTHTYPE_NAME (pointer[i]))
 		    fprintf (NetTrace, "%s ", AUTHTYPE_NAME (pointer[i]));
 		  else
 		    fprintf (NetTrace, "%d ", pointer[i]);
diff --git a/telnetd/utility.c b/telnetd/utility.c
index da16788..028afb2 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -1410,7 +1410,7 @@ printsub (int direction, unsigned char *pointer, int length)
 	case TELQUAL_IS:
 	  debug_output_data (" %s ", (pointer[1] == TELQUAL_IS) ?
 			     "IS" : "REPLY");
-	  if (AUTHTYPE_NAME_OK (pointer[2]))
+	  if (AUTHTYPE_NAME_OK (pointer[2]) && AUTHTYPE_NAME (pointer[2]))
 	    debug_output_data ("%s ", AUTHTYPE_NAME (pointer[2]));
 	  else
 	    debug_output_data ("%d ", pointer[2]);
@@ -1434,7 +1434,8 @@ printsub (int direction, unsigned char *pointer, int length)
 	  debug_output_data (" SEND ");
 	  while (i < length)
 	    {
-	      if (AUTHTYPE_NAME_OK (pointer[i]))
+	      if (AUTHTYPE_NAME_OK (pointer[i])
+		  && AUTHTYPE_NAME (pointer[i]))
 		debug_output_data ("%s ", AUTHTYPE_NAME (pointer[i]));
 	      else
 		debug_output_data ("%d ", pointer[i]);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |   16 ++++++++++++
 libtelnet/auth.c   |   69 ++++++++++++++++++++++++++++-----------------------
 telnet/utilities.c |    5 ++-
 telnetd/utility.c  |    5 ++-
 4 files changed, 60 insertions(+), 35 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue May 14 16:40:29 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UcM1M-00035d-Vl
	for mharc-commit-inetutils@gnu.org; Tue, 14 May 2013 16:40:28 -0400
Received: from eggs.gnu.org ([208.118.235.92]:57425)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UcM1I-0002zn-SD
	for commit-inetutils@gnu.org; Tue, 14 May 2013 16:40:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UcM1H-0006Cm-8Z
	for commit-inetutils@gnu.org; Tue, 14 May 2013 16:40:24 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:53786)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UcM1H-0006Ca-3z
	for commit-inetutils@gnu.org; Tue, 14 May 2013 16:40:23 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1UcM1F-0002ck-RA
	for commit-inetutils@gnu.org; Tue, 14 May 2013 20:40:22 +0000
Date: Tue, 14 May 2013 20:40:21 +0000
Message-Id: <E1UcM1F-0002ck-RA@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-287-ge4c1a64
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3864a49a23d70caddedddd4a52ed10ee443ee192
X-Git-Newrev: e4c1a64a7b1a81078424ce5c1512864d9385e942
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 May 2013 20:40:26 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  e4c1a64a7b1a81078424ce5c1512864d9385e942 (commit)
      from  3864a49a23d70caddedddd4a52ed10ee443ee192 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=e4c1a64a7b1a81078424ce5c1512864d9385e942


commit e4c1a64a7b1a81078424ce5c1512864d9385e942
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Tue May 14 22:36:33 2013 +0200

    telnetd: Silence unwanted debugging.
    
    New debugging mode `encr'.  Do not add text
    for `auth' and `encr' into `/tmp/telnet.debug'
    without explicit debug setting.

diff --git a/ChangeLog b/ChangeLog
index 584f857..1c8e2be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 2013-05-14  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	telnetd: Silence unwanted debugging.
+
+	* telnetd/telnetd.h (enum debug_mode): Add `debug_encr'.
+	* telnetd/telnetd.c (debug_mode): Add member `encr'.
+	* telnetd/utility.c (printsub): Return immediately if
+	the option is TELOPT_AUTHENTICATION or TELOPT_ENCRYPT
+	and the corresponding debug level is unset.
+
+	telnetd: Logging of failed command line options.
+
+	* telnetd/telnetd.c (main): Call openlog() before
+	argp_parse().  Facility is now correct!
+	(parse_linemode): Send a log notice
+	about parsing failure; the client receives stderr!
+	(parse_authmode) [AUTHENTICATION]: Likewise.
+	(parse_debug_level): Likewise.
+
+2013-05-14  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	libtelnet: The list of authentication names is
 	allowed to contain NULL entries.  Prevent access
 	to such entries.
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index ad7870a..1843fd3 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -4706,17 +4706,18 @@ Specify what mode to use for authentication.  Allowed values are:
 @opindex --debug
 Set the debugging level.  The argument is a comma separated list of
 these categories: @samp{options}, @samp{report}, @samp{netdata},
-@samp{ptydata}, and @samp{auth}.  All these may be used in the form
-@samp{name[=level]}.  Omission of @samp{level} implies the maximal
-possible debugging for that particular category.
+@samp{ptydata}, @samp{auth}, and @samp{encr}.
+All these may be used in the form @samp{name[=level]}.
+Omission of @samp{level} implies the maximal
+possible debugging level for that particular category.
 
-There is one additional category @samp{tcp}, that does not allow
-the additional level indicator, but is instead equivalent to
+There is one additional category @samp{tcp}, which does not take
+an additional level indicator, but is instead equivalent to
 setting the socket option @samp{SO_DEBUG} for debugging the
 complete traffic.
 
-The outcome is the file @file{/tmp/telnet.debug}, to which
-data is incrementally added as time passes.
+The output is written to the file @file{/tmp/telnet.debug},
+and any new data is incrementally added as time passes.
 
 @item -E @var{string}
 @itemx --exec-login=@var{string}
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index f7886f3..2736545 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -205,12 +205,14 @@ main (int argc, char **argv)
 
   set_program_name (argv[0]);
   iu_argp_init ("telnetd", default_program_authors);
+
+  openlog ("telnetd", LOG_PID | LOG_ODELAY, LOG_DAEMON);
+
   argp_parse (&argp, argc, argv, 0, &index, NULL);
 
   if (argc != index)
     error (EXIT_FAILURE, 0, "junk arguments in the command line");
 
-  openlog ("telnetd", LOG_PID | LOG_ODELAY, LOG_DAEMON);
   telnetd_setup (0);
   return telnetd_run ();
 }
@@ -223,7 +225,7 @@ parse_linemode (char *str)
   else if (strcmp (str, "nokludge") == 0)
     lmodetype = NO_AUTOKLUDGE;
   else
-    fprintf (stderr, "telnetd: invalid argument to --linemode\n");
+    syslog (LOG_NOTICE, "invalid argument to --linemode: %s", str);
 }
 
 #ifdef  AUTHENTICATION
@@ -241,7 +243,7 @@ parse_authmode (char *str)
   else if (strcasecmp (str, "off") == 0)
     auth_level = -1;
   else
-    fprintf (stderr, "telnetd: unknown authorization level for -a\n");
+    syslog (LOG_NOTICE, "unknown authorization level for -a: %s", str);
 }
 #endif /* AUTHENTICATION */
 
@@ -255,7 +257,9 @@ static struct
   {"report", debug_report},
   {"netdata", debug_net_data},
   {"ptydata", debug_pty_data},
-  {"auth", debug_auth},};
+  {"auth", debug_auth},
+  {"encr", debug_encr},
+};
 
 void
 parse_debug_level (char *str)
@@ -301,7 +305,7 @@ parse_debug_level (char *str)
 	  }
 
       if (i == debug_max_mode)
-	fprintf (stderr, "telnetd: unknown debug mode: %s", tok);
+	syslog (LOG_NOTICE, "unknown debug mode: %s", tok);
     }
 }
 
diff --git a/telnetd/telnetd.h b/telnetd/telnetd.h
index 6443195..6236722 100644
--- a/telnetd/telnetd.h
+++ b/telnetd/telnetd.h
@@ -73,6 +73,7 @@ typedef enum debug_mode
   debug_net_data,
   debug_pty_data,
   debug_auth,
+  debug_encr,
   debug_max_mode
 } debug_mode_t;
 
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 028afb2..be3507f 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -940,6 +940,14 @@ printsub (int direction, unsigned char *pointer, int length)
   unsigned char buf[512];
 #endif
 
+  /* Silence unwanted debugging to '/tmp/telnet.debug'.
+   *
+   * XXX: Better location?
+   */
+  if ((pointer[0] == TELOPT_AUTHENTICATION && debug_level[debug_auth] < 1)
+      || (pointer[0] == TELOPT_ENCRYPT && debug_level[debug_encr] < 1))
+    return;
+
   if (direction)
     {
       debug_output_data ("td: %s suboption ",

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |   19 +++++++++++++++++++
 doc/inetutils.texi |   15 ++++++++-------
 telnetd/telnetd.c  |   14 +++++++++-----
 telnetd/telnetd.h  |    1 +
 telnetd/utility.c  |    8 ++++++++
 5 files changed, 45 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue May 14 19:05:07 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UcOHL-0006B8-Dt
	for mharc-commit-inetutils@gnu.org; Tue, 14 May 2013 19:05:07 -0400
Received: from eggs.gnu.org ([208.118.235.92]:33458)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UcOHH-00067g-QK
	for commit-inetutils@gnu.org; Tue, 14 May 2013 19:05:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UcOHE-0006I3-Up
	for commit-inetutils@gnu.org; Tue, 14 May 2013 19:05:03 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:55390)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UcOHE-0006Hy-R8
	for commit-inetutils@gnu.org; Tue, 14 May 2013 19:05:00 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1UcOHE-0002VD-8R
	for commit-inetutils@gnu.org; Tue, 14 May 2013 23:05:00 +0000
Date: Tue, 14 May 2013 23:05:00 +0000
Message-Id: <E1UcOHE-0002VD-8R@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-288-g129168f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e4c1a64a7b1a81078424ce5c1512864d9385e942
X-Git-Newrev: 129168ffccbdf29ccaf5948f4154f0d2d58e63a2
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 May 2013 23:05:05 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  129168ffccbdf29ccaf5948f4154f0d2d58e63a2 (commit)
      from  e4c1a64a7b1a81078424ce5c1512864d9385e942 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=129168ffccbdf29ccaf5948f4154f0d2d58e63a2


commit 129168ffccbdf29ccaf5948f4154f0d2d58e63a2
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed May 15 01:01:40 2013 +0200

    Audit of login options.

diff --git a/ChangeLog b/ChangeLog
index 1c8e2be..1ef073f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-05-15  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Audit of login options.
+
+	* configure.ac (SOLARIS10): Replace previous
+	macro SOLARIS11.
+	* src/rlogind.c (exec_login) [SOLARIS10]:
+	Use previous Solaris settings.
+	[SOLARIS]: Simplified setting.
+	* telnetd/telnetd.c (login_invocation)
+	[SOLARIS10 || SOLARIS]: Likewise, as two cases!
+
 2013-05-14  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	telnetd: Silence unwanted debugging.
diff --git a/configure.ac b/configure.ac
index ac95660..ac09d4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -955,8 +955,8 @@ case "$host" in
   ;;
 *olaris* )
   case "$host" in
-  *olaris*11 )
-    AC_DEFINE([SOLARIS11], 1, [OpenSolaris and newer Solaris.])
+  *olaris*10 | *olaris*11 )
+    AC_DEFINE([SOLARIS10], 1, [Solaris 10 and newer variants.])
     ;;
   * )
     # Older Solaris variants.
diff --git a/src/rlogind.c b/src/rlogind.c
index 70581ab..1334065 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -1118,24 +1118,39 @@ exec_login (int authenticated, struct auth_data *ap)
 {
   if (authenticated)
     {
-#ifdef SOLARIS
+#ifdef SOLARIS10
+      /* TODO: Add `-u' with Kerberos principal name of user.
+       */
       execle (path_login, "login", "-p", "-s", "krlogin",
 	      "-r", ap->hostname, "-U", ap->rusername,
 	      ap->lusername, NULL, ap->env);
+#elif defined SOLARIS
+      execle (path_login, "login", "-p", "-r", ap->hostname,
+	      ap->lusername, NULL, ap->env);
 #else
-      execle (path_login, "login", "-p",
-	      "-h", ap->hostname, "-f", ap->lusername, NULL, ap->env);
+      /* Some GNU/Linux systems, but not all,  provide `-r'
+       * for use instead of `-h'.  Some BSD systems provide `-u'.
+       */
+      execle (path_login, "login", "-p", "-h", ap->hostname, "-f",
+	      ap->lusername, NULL, ap->env);
 #endif
     }
   else
     {
-#ifdef SOLARIS
+#ifdef SOLARIS10
+      /* `-U' in not strictly needed, but is harmless.  */
       execle (path_login, "login", "-p", "-s", "rlogin",
 	      "-r", ap->hostname, "-U", ap->rusername,
 	      ap->lusername, NULL, ap->env);
+#elif defined SOLARIS
+      execle (path_login, "login", "-p", "-r", ap->hostname,
+	      ap->lusername, NULL, ap->env);
 #else
-      execle (path_login, "login", "-p",
-	      "-h", ap->hostname, ap->lusername, NULL, ap->env);
+      /* Some GNU/Linux systems, but not all,  provide `-r'
+       * for use instead of `-h'.  Some BSD systems provide `-u'.
+       */
+      execle (path_login, "login", "-p", "-h", ap->hostname,
+	      ap->lusername, NULL, ap->env);
 #endif
     }
   syslog (LOG_ERR, "can't exec login: %m");
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 2736545..3af45e6 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -43,13 +43,20 @@ static void telnetd_setup (int fd);
 static int telnetd_run (void);
 static void print_hostinfo (void);
 
-/* Template command line for invoking login program */
+/* Template command line for invoking login program.  */
 
 char *login_invocation =
-#ifdef SOLARIS11
+#ifdef SOLARIS10
+  /* TODO: `-s telnet' or `-s ktelnet'.
+   *       `-u' takes the Kerberos principal name
+   *       of the authenticating, remote user.
+   */
   PATH_LOGIN " -p -h %h %?T{-t %T} %?u{-u %u}"
+
 #elif defined SOLARIS
-  PATH_LOGIN " -h %h %?T{-t %T} %?u{-u %u}"
+  /* At least for SunOS 5.8.  */
+  PATH_LOGIN " -h %h %?T{%T} %?u{-- %u}"
+
 #else /* !SOLARIS */
   PATH_LOGIN " -p -h %h %?u{-f %u}"
 #endif

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   12 ++++++++++++
 configure.ac      |    4 ++--
 src/rlogind.c     |   27 +++++++++++++++++++++------
 telnetd/telnetd.c |   13 ++++++++++---
 4 files changed, 45 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed May 15 10:05:48 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UccKy-00069T-OY
	for mharc-commit-inetutils@gnu.org; Wed, 15 May 2013 10:05:48 -0400
Received: from eggs.gnu.org ([208.118.235.92]:41861)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UccKq-00068V-Vf
	for commit-inetutils@gnu.org; Wed, 15 May 2013 10:05:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UccKp-0007Mo-00
	for commit-inetutils@gnu.org; Wed, 15 May 2013 10:05:40 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37246)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UccKo-0007Mk-TU
	for commit-inetutils@gnu.org; Wed, 15 May 2013 10:05:38 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1UccKm-0005OF-6w
	for commit-inetutils@gnu.org; Wed, 15 May 2013 14:05:38 +0000
Date: Wed, 15 May 2013 14:05:36 +0000
Message-Id: <E1UccKm-0005OF-6w@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-290-gd987526
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 129168ffccbdf29ccaf5948f4154f0d2d58e63a2
X-Git-Newrev: d987526e82bb5b9757a93cda7f67c33265b54477
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 14:05:46 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  d987526e82bb5b9757a93cda7f67c33265b54477 (commit)
       via  2d29628f5b9781ff36871d8ed94367d7d6d827a0 (commit)
      from  129168ffccbdf29ccaf5948f4154f0d2d58e63a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=d987526e82bb5b9757a93cda7f67c33265b54477


commit d987526e82bb5b9757a93cda7f67c33265b54477
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed May 15 15:13:11 2013 +0200

    rshd: Client's principal name.

diff --git a/ChangeLog b/ChangeLog
index 3635e88..c19fdff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2013-05-15  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	rshd: Report client's principal name.
+
+	* src/rshd.c (rprincipal): New variable.
+	(doit) [SHISHI] <use_kerberos>: Set `rprincipal'
+	using shishi_encticketpart_clientrealm().
+	[KRB5] <use_kerberos>: New calls to krb5_kuserok()
+	and krb5_unparse_name().
+	(doit): Report success to syslog using `rprincipal'.
+
+2013-05-15  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	rlogind: Report client's principal name.
 
 	* libinetutils/shishi_def.h (struct auth_data):
diff --git a/src/rshd.c b/src/rshd.c
index 11bcd7d..1108401 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -433,6 +433,7 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
   const char *hostname, *errorstr, *errorhost = NULL;
   char *cp, sig, buf[BUFSIZ];
   char *cmdbuf, *locuser, *remuser;
+  char *rprincipal = NULL;
 #if defined WITH_IRUSEROK_AF && !defined WITH_PAM
   void * fromaddrp;	/* Pointer to remote address.  */
 #endif
@@ -1118,6 +1119,12 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 
     free (compcksum);
 
+    rc = shishi_encticketpart_clientrealm (h,
+			shishi_tkt_encticketpart (shishi_ap_tkt (ap)),
+			&rprincipal, NULL);
+    if (rc != SHISHI_OK)
+      rprincipal = NULL;
+
     shishi_ap_done (ap);
 
   }
@@ -1128,7 +1135,14 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 
       rc = krb5_copy_principal (context, ticket->enc_part2->client,
 				&client);
+      if (rc)
+	goto fail;	/* FIXME: Temporary handler.  */
+
+      if (client && !krb5_kuserok (context, client, locuser))
+	goto fail;	/* FIXME: Temporary handler.  */
 
+      rprincipal = NULL;
+      krb5_unparse_name (context, client, &rprincipal);
     }
 #endif /* KRB5 || SHISHI */
 
@@ -1788,7 +1802,7 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
       else
 #endif /* KRB4 */
 	syslog (LOG_INFO | LOG_AUTH,
-		"%s%s@%s as %s: cmd='%.80s'",
+		"%s%s from %s as '%s': cmd='%.80s'",
 #ifdef SHISHI
 		!use_kerberos ? ""
 		  : !doencrypt ? "Kerberized "
@@ -1796,7 +1810,8 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 #else
 		"",
 #endif
-		remuser, hostname, locuser, cmdbuf);
+		rprincipal ? rprincipal : remuser,
+		hostname, locuser, cmdbuf);
     }
 #ifdef SHISHI
   if (doencrypt)

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=2d29628f5b9781ff36871d8ed94367d7d6d827a0


commit 2d29628f5b9781ff36871d8ed94367d7d6d827a0
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed May 15 12:54:01 2013 +0200

    rlogind: Client's principal name.

diff --git a/ChangeLog b/ChangeLog
index 1ef073f..3635e88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 2013-05-15  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	rlogind: Report client's principal name.
+
+	* libinetutils/shishi_def.h (struct auth_data):
+	New member `rprincipal'.
+	* src/rlogind.c (struct auth_data) [!SHISHI]:
+	Likewise.
+	(do_krb5_login) [KRB5]: Delete NAME.  Assign value
+	to `ap->rprincipal' using previous krb5_unparse_name().
+	(do_shishi_login) [SHISHI]:
+	Call shishi_encticketpart_clientrealm() to set
+	`ad->rprincipal'.  Let the syslog message mention
+	the client's principal name, instead of remote name.
+
+	rlogind: Login options for Solaris again!
+
+	* src/rlogind.c (exec_login) [SOLARIS10 || SOLARIS]:
+	Make option orders roughly similar.  Add option `-d'.
+	<authenticated> [KERBEROS || SHISHI]: Add option `-u'
+	with remote client's principal name.  Depending on
+	`kerberos', let `-s' take argument `krlogin' or `rlogin'.
+
+2013-05-15  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	Audit of login options.
 
 	* configure.ac (SOLARIS10): Replace previous
diff --git a/libinetutils/shishi_def.h b/libinetutils/shishi_def.h
index 1f0d3d1..5dfd139 100644
--- a/libinetutils/shishi_def.h
+++ b/libinetutils/shishi_def.h
@@ -42,6 +42,7 @@ struct auth_data
   char *hostname;
   char *lusername;
   char *rusername;
+  char *rprincipal;
   char *term;
   char *env[2];
   int kerberos_version;
diff --git a/src/rlogind.c b/src/rlogind.c
index 1334065..cb81cec 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -206,6 +206,7 @@ struct auth_data
   char *hostname;
   char *lusername;
   char *rusername;
+  char *rprincipal;
   char *term;
   char *env[2];
 # ifdef KERBEROS
@@ -1119,15 +1120,21 @@ exec_login (int authenticated, struct auth_data *ap)
   if (authenticated)
     {
 #ifdef SOLARIS10
-      /* TODO: Add `-u' with Kerberos principal name of user.
-       */
-      execle (path_login, "login", "-p", "-s", "krlogin",
-	      "-r", ap->hostname, "-U", ap->rusername,
-	      ap->lusername, NULL, ap->env);
-#elif defined SOLARIS
       execle (path_login, "login", "-p", "-r", ap->hostname,
+	      "-d", line, "-U", ap->rusername,
+# if defined KERBEROS || defined SHISHI
+	      "-s", (kerberos ? "krlogin" : "rlogin"),
+	      "-u", (ap->rprincipal ? ap->rprincipal : ap->rusername),
+# else /* !KERBEROS && !SHISHI */
+	      "-s", "rlogin",
+# endif
 	      ap->lusername, NULL, ap->env);
-#else
+
+#elif defined SOLARIS	/* !SOLARIS10 */
+      execle (path_login, "login", "-p", "-r", ap->hostname,
+	      "-d", line, ap->lusername, NULL, ap->env);
+
+#else /* !SOLARIS */
       /* Some GNU/Linux systems, but not all,  provide `-r'
        * for use instead of `-h'.  Some BSD systems provide `-u'.
        */
@@ -1138,13 +1145,13 @@ exec_login (int authenticated, struct auth_data *ap)
   else
     {
 #ifdef SOLARIS10
-      /* `-U' in not strictly needed, but is harmless.  */
-      execle (path_login, "login", "-p", "-s", "rlogin",
-	      "-r", ap->hostname, "-U", ap->rusername,
+      /* `-U' in not strictly needed, but is probably harmless.  */
+      execle (path_login, "login", "-p", "-r", ap->hostname,
+	      "-d", line, "-s", "rlogin", "-U", ap->rusername,
 	      ap->lusername, NULL, ap->env);
 #elif defined SOLARIS
       execle (path_login, "login", "-p", "-r", ap->hostname,
-	      ap->lusername, NULL, ap->env);
+	      "-d", line, ap->lusername, NULL, ap->env);
 #else
       /* Some GNU/Linux systems, but not all,  provide `-r'
        * for use instead of `-h'.  Some BSD systems provide `-u'.
@@ -1478,7 +1485,6 @@ do_krb5_login (int infd, struct auth_data *ap, const char **err_msg)
   struct sockaddr_in laddr;
   int len;
   struct passwd *pwd;
-  char *name;
 
   status = krb5_init_context (&ap->context);
   if (status)
@@ -1576,12 +1582,15 @@ do_krb5_login (int infd, struct auth_data *ap, const char **err_msg)
   if (ap->client && !krb5_kuserok (ap->context, ap->client, ap->lusername))
     return 1;
 
-  krb5_unparse_name (ap->context, ap->client, &name);
+  ap->rprincipal = NULL;
+
+  krb5_unparse_name (ap->context, ap->client, &ap->rprincipal);
 
   syslog (LOG_INFO | LOG_AUTH,
 	  "%sKerberos V login from %s on %s\n",
-	  (pwd->pw_uid == 0) ? "ROOT " : "", name, ap->hostname);
-  free (name);
+	  (pwd->pw_uid == 0) ? "ROOT " : "",
+	  ap->rprincipal ? ap->rprincipal : ap->rusername,
+	  ap->hostname);
 
   return 0;
 }
@@ -1733,6 +1742,12 @@ do_shishi_login (int infd, struct auth_data *ad, const char **err_msg)
       return rc;
     }
 
+  rc = shishi_encticketpart_clientrealm (ad->h,
+			shishi_tkt_encticketpart (shishi_ap_tkt (ad->ap)),
+			&ad->rprincipal, NULL);
+  if (rc != SHISHI_OK)
+    ad->rprincipal = NULL;
+
   shishi_ap_done (ad->ap);
 
 #  ifdef WITH_PAM
@@ -1747,7 +1762,9 @@ do_shishi_login (int infd, struct auth_data *ad, const char **err_msg)
   syslog (LOG_INFO | LOG_AUTH,
 	  "Kerberos V %slogin from %s on %s as `%s'.\n",
 	  ENCRYPT_IO ? "encrypted " : "",
-	  ad->rusername, ad->hostname, ad->lusername);
+	  ad->rprincipal ? ad->rprincipal : ad->rusername,
+	  ad->hostname,
+	  ad->lusername);
 
   return SHISHI_OK;
 }

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                 |   34 +++++++++++++++++++++++++++++++
 libinetutils/shishi_def.h |    1 +
 src/rlogind.c             |   49 ++++++++++++++++++++++++++++++--------------
 src/rshd.c                |   19 +++++++++++++++-
 4 files changed, 85 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed May 22 05:01:06 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uf4uw-0008GO-7d
	for mharc-commit-inetutils@gnu.org; Wed, 22 May 2013 05:01:06 -0400
Received: from eggs.gnu.org ([208.118.235.92]:33354)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uf4ur-0008GD-Is
	for commit-inetutils@gnu.org; Wed, 22 May 2013 05:01:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uf4uk-0001Fj-A0
	for commit-inetutils@gnu.org; Wed, 22 May 2013 05:01:01 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:59637)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uf4uk-0001FZ-4E
	for commit-inetutils@gnu.org; Wed, 22 May 2013 05:00:54 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1Uf4uj-0001vO-4U
	for commit-inetutils@gnu.org; Wed, 22 May 2013 09:00:53 +0000
Date: Wed, 22 May 2013 09:00:53 +0000
Message-Id: <E1Uf4uj-0001vO-4U@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-294-ge9306b9
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d987526e82bb5b9757a93cda7f67c33265b54477
X-Git-Newrev: e9306b9bb186eb8d919ea36a6d8d5e8b3c12c49d
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 May 2013 09:01:04 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  e9306b9bb186eb8d919ea36a6d8d5e8b3c12c49d (commit)
       via  d485b14c3ba2d0612ef47feff0b99163c7fc0121 (commit)
       via  9ee96c972996b39b42b880d8e3c4c031440e3324 (commit)
       via  a98c1047accf76e0264fe76c4644246524aacc0d (commit)
      from  d987526e82bb5b9757a93cda7f67c33265b54477 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=e9306b9bb186eb8d919ea36a6d8d5e8b3c12c49d


commit e9306b9bb186eb8d919ea36a6d8d5e8b3c12c49d
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat May 18 19:06:03 2013 +0200

    libtelnet: Portability of enctype_names.

diff --git a/ChangeLog b/ChangeLog
index de3fc37..91b8589 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-05-18  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	libtelnet: Portability of enctype_names.
+
+	* configure.ac (HAVE_CONST_CHAR_ENCTYPE_NAMES):
+	Check if <arpa/telnet.h> declares enctype_names
+	as `const char []'.
+	* libtelnet/encrypt.c (enctype_names)
+	[HAVE_CONST_CHAR_ENCTYPE_NAMES]: Declare as
+	constant array.
+
 2013-05-17  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	libtelnet: Selected compiler warnings.
diff --git a/configure.ac b/configure.ac
index ac09d4b..994b3e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -827,6 +827,19 @@ AC_CHECK_TYPE(Session_Key,
 	    [Define to 1 if <arpa/telnet.h> defines a type Session_Key.]), ,
   [#include <arpa/telnet.h>])
 
+# At least NetBSD demands `const char []'.
+AC_MSG_CHECKING([whether enctype_names is const char])
+AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM(
+     [[#include <arpa/telnet.h>
+       const char *enctype_names[] = { "ANY", "CFB64", 0 };]],
+     [[ return 0;]])],
+  [AC_DEFINE([HAVE_CONST_CHAR_ENCTYPE_NAMES], 1,
+	     [Define to 1 if enctype_names[] must be const char.])
+   ac_iu_const_enctype_names=yes],
+  [ac_iu_const_enctype_names=no])
+AC_MSG_RESULT([$ac_iu_const_enctype_names])
+
 ## Checks for function declarations.
 
 AC_DECL_SYS_SIGLIST
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index 29eb37d..41bc631 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -86,7 +86,12 @@
 /* String representation of our capabilities.
  * Solaris will gain DES_OFB64!
  */
-char *enctype_names[] = {
+# ifdef HAVE_CONST_CHAR_ENCTYPE_NAMES
+const char *enctype_names[] =
+# else
+char *enctype_names[] =
+# endif
+{
   "ANY", "DES_CFB64", "DES_OFB64", 0,
 };
 

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=d485b14c3ba2d0612ef47feff0b99163c7fc0121


commit d485b14c3ba2d0612ef47feff0b99163c7fc0121
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri May 17 23:51:36 2013 +0200

    libtelnet: Selected compiler warnings.

diff --git a/ChangeLog b/ChangeLog
index 2b000c1..de3fc37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2013-05-17  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	libtelnet: Selected compiler warnings.
+
+	* libtelnet/auth.c (auth_send): Cast sizeof() as int.
+	(auth_name): Remove AP.  Make SAVENAME a char array.
+	Cast sizeof() as int.  Rewrite debug message for
+	overflowing name.
+	* libtelnet/enc_des.c (FB64_IV, FB64_IV_OK)
+	(FB64_IV_BAD): Make definitions conditional.
+	(fb64_session): Cast `key->length' as size_t.
+	* libtelnet/encrypt.c (encrypt_is): Do assignment
+	before if-statament.  Use format `%p' with pointer.
+	(encrypt_reply): Likewise.
+	(encrypt_start): Use separate assigment.
+	(encrypt_keyid): Likewise.  Delete STRP and CP.
+	(encrypt_start_output): Use separate assignment.
+	(encrypt_send_request_end): Remove ENCRYPT and DECRYPT.
+
+	* libtelnet/kerberos5.c (kerberos5_is_auth): Make static.
+	(kerberos5_is_forward) [FORWARD]: Likewise.
+	* libtelnet/shishi.c (Data): Third argument is `void *'.
+	Cast as `char *' for strlen().
+	(shishi_init_key) [ENCRYPTION]: Make static.  Cast result
+	from shishi_key_value() as `unsigned char *'.
+	(krb5shishi_reply): shishi_ap_rep_verify_der() needs a cast
+	as `char *'.
+	(krb5shishi_status): Delete RC.
+	(krb5shishi_is_auth): Make static.  Delete KEY2.
+	shishi_ap_req_der_set() needs cast as `char *'.
+
+	* telnet/authenc.c (telnet_getenv): Do not cast `val'.
+
+2013-05-17  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	ftp, telnet: Erase passwords after use.
 
 	* ftp/cmds.c (user): Erase password string after getpass().
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index 13fb824..e502b3c 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -470,8 +470,8 @@ auth_send (unsigned char *data, int cnt)
   if (data < _auth_send_data ||
       data > _auth_send_data + sizeof (_auth_send_data))
     {
-      auth_send_cnt = cnt > sizeof (_auth_send_data)
-	? sizeof (_auth_send_data) : cnt;
+      auth_send_cnt = (cnt > (int) sizeof (_auth_send_data))
+		      ? (int) sizeof (_auth_send_data) : cnt;
       memmove ((void *) _auth_send_data, (void *) data, auth_send_cnt);
       auth_send_data = _auth_send_data;
     }
@@ -605,8 +605,7 @@ auth_reply (unsigned char *data, int cnt)
 void
 auth_name (unsigned char *data, int cnt)
 {
-  TN_Authenticator *ap;
-  unsigned char savename[256];
+  char savename[256];
 
   if (cnt < 1)
     {
@@ -614,10 +613,10 @@ auth_name (unsigned char *data, int cnt)
 	printf (">>>%s: Empty name in NAME\r\n", Name);
       return;
     }
-  if (cnt > sizeof (savename) - 1)
+  if (cnt + 1 > (int) sizeof (savename))
     {
       if (auth_debug_mode)
-	printf (">>>%s: Name in NAME (%d) exceeds %d length\r\n",
+	printf (">>>%s: Name in NAME (len %d) overflows buffer (len %zu).\r\n",
 		Name, cnt, sizeof (savename) - 1);
       return;
     }
diff --git a/libtelnet/enc_des.c b/libtelnet/enc_des.c
index 2b348a1..3ad0df6 100644
--- a/libtelnet/enc_des.c
+++ b/libtelnet/enc_des.c
@@ -127,9 +127,15 @@ struct keyidlist
 
 #   define SHIFT_VAL(a,b)	(KEYFLAG_SHIFT*((a)+((b)*2)))
 
-#   define FB64_IV	1
-#   define FB64_IV_OK	2
-#   define FB64_IV_BAD	3
+#   ifndef FB64_IV
+#    define FB64_IV	1
+#   endif
+#   ifndef FB64_IV_OK
+#    define FB64_IV_OK	2
+#   endif
+#   ifndef FB64_IV_BAD
+#    define FB64_IV_BAD	3
+#   endif
 
 
 /* Callback from consumer.  */
@@ -482,7 +488,7 @@ fb64_session (Session_Key *key, int server, struct fb *fbp)
   memmove ((void *) derived_key, (void *) key->data, key->length);
 
   /* Check parity of each DES block, correct it whenever needed.  */
-  for (offset = 0; offset < key->length; offset += sizeof (Block))
+  for (offset = 0; offset < (size_t) key->length; offset += sizeof (Block))
     (void) des_set_parity (derived_key + offset);
 
   /* XXX: A single key block is in use for now,
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index 5d59b0c..29eb37d 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -567,7 +567,9 @@ encrypt_is (unsigned char *data, int cnt)
   type = *data++;
   if (type < ENCTYPE_CNT)
     remote_supports_encrypt |= typemask (type);
-  if (!(ep = finddecryption (type)))
+
+  ep = finddecryption (type);
+  if (!ep)
     {
       if (encrypt_debug_mode)
 	printf (">>>%s: Can't find type %s (%d) for initial negotiation\r\n",
@@ -589,9 +591,11 @@ encrypt_is (unsigned char *data, int cnt)
     {
       ret = (*ep->is) (data, cnt);
       if (encrypt_debug_mode)
-	printf ("(*ep->is)(%x, %d) returned %s(%d)\n", data, cnt,
-		(ret < 0) ? "FAIL " :
-		(ret == 0) ? "SUCCESS " : "MORE_TO_DO ", ret);
+	printf ("(*ep->is)(%p, %d) returned %s (%d).\r\n",
+		data, cnt,
+		(ret < 0) ? "FAIL "
+			  : ((ret == 0) ? "SUCCESS " : "MORE_TO_DO "),
+		ret);
     }
   if (ret < 0)
     autodecrypt = 0;
@@ -612,7 +616,9 @@ encrypt_reply (unsigned char *data, int cnt)
   if (--cnt < 0)
     return;
   type = *data++;
-  if (!(ep = findencryption (type)))
+
+  ep = findencryption (type);
+  if (!ep)
     {
       if (encrypt_debug_mode)
 	printf (">>>%s: Can't find type %s (%d) for initial negotiation\r\n",
@@ -634,10 +640,11 @@ encrypt_reply (unsigned char *data, int cnt)
     {
       ret = (*ep->reply) (data, cnt);
       if (encrypt_debug_mode)
-	printf ("(*ep->reply)(%x, %d) returned %s(%d)\n",
+	printf ("(*ep->reply)(%p, %d) returned %s (%d).\r\n",
 		data, cnt,
-		(ret < 0) ? "FAIL " :
-		(ret == 0) ? "SUCCESS " : "MORE_TO_DO ", ret);
+		(ret < 0) ? "FAIL "
+			  : ((ret == 0) ? "SUCCESS " : "MORE_TO_DO "),
+		ret);
     }
   if (encrypt_debug_mode)
     printf (">>>%s: encrypt_reply returned %d\n", Name, ret);
@@ -672,7 +679,8 @@ encrypt_start (unsigned char *data, int cnt)
       return;
     }
 
-  if (ep = finddecryption (decrypt_mode))
+  ep = finddecryption (decrypt_mode);
+  if (ep)
     {
       decrypt_input = ep->input;
       if (encrypt_verbose)
@@ -754,14 +762,14 @@ static void
 encrypt_keyid (struct key_info *kp, unsigned char *keyid, int len)
 {
   Encryptions *ep;
-  unsigned char *strp, *cp;
   int dir = kp->dir;
   int ret = 0;
 
   if (len > MAXKEYLEN)
     len = MAXKEYLEN;
 
-  if (!(ep = (*kp->getcrypt) (*kp->modep)))
+  ep = (*kp->getcrypt) (*kp->modep);
+  if (!ep)
     {
       if (len == 0)
 	return;
@@ -862,7 +870,8 @@ encrypt_start_output (int type)
   unsigned char *p;
   int i;
 
-  if (!(ep = findencryption (type)))
+  ep = findencryption (type);
+  if (!ep)
     {
       if (encrypt_debug_mode)
 	{
@@ -970,7 +979,6 @@ encrypt_send_request_end (void)
 void
 encrypt_wait (void)
 {
-  int encrypt, decrypt;
   if (encrypt_debug_mode)
     printf (">>>%s: in encrypt_wait\r\n", Name);
   if (!havesessionkey || !(I_SUPPORT_ENCRYPT & remote_supports_decrypt))
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index 9ac4ab3..e1280e9 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -443,7 +443,7 @@ kerberos5_status (TN_Authenticator * ap, char *name, size_t len,
   return AUTH_USER;
 }
 
-int
+static int
 kerberos5_is_auth (TN_Authenticator * ap, unsigned char *data, int cnt,
 		   char *errbuf, int errbuflen)
 {
@@ -639,7 +639,7 @@ kerberos5_is_auth (TN_Authenticator * ap, unsigned char *data, int cnt,
 }
 
 # ifdef FORWARD
-int
+static int
 kerberos5_is_forward (TN_Authenticator * ap, unsigned char *data, int cnt,
 		      char *errbuf, int errbuflen)
 {
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index c40b05f..34b0446 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -62,13 +62,14 @@ Shishi_ap *auth_handle;
 extern void printsub (char, unsigned char *, int);
 
 static int
-Data (TN_Authenticator * ap, int type, unsigned char *d, int c)
+Data (TN_Authenticator * ap, int type, void * d, int c)
 {
   unsigned char *p = str_data + 4;
   unsigned char *cd = (unsigned char *) d;
 
+  /* Submitted as test data.  */
   if (c == -1)
-    c = strlen (cd);
+    c = strlen ((char *) cd);
 
   if (auth_debug_mode)
     {
@@ -293,18 +294,18 @@ krb5shishi_send (TN_Authenticator * ap)
 }
 
 # ifdef ENCRYPTION
-void
+static void
 shishi_init_key (Session_Key * skey, int type)
 {
   int32_t etype = shishi_key_type (enckey);
 
-  if (etype == SHISHI_DES_CBC_CRC ||
-      etype == SHISHI_DES_CBC_MD4 || etype == SHISHI_DES_CBC_MD5)
+  if (etype == SHISHI_DES_CBC_CRC || etype == SHISHI_DES_CBC_MD4
+      || etype == SHISHI_DES_CBC_MD5)
     skey->type = SK_DES;
   else
     skey->type = SK_OTHER;
   skey->length = shishi_key_length (enckey);
-  skey->data = shishi_key_value (enckey);
+  skey->data = (unsigned char *) shishi_key_value (enckey);
 
   encrypt_session_key (skey, type);
 }
@@ -363,7 +364,8 @@ krb5shishi_reply (TN_Authenticator * ap, unsigned char *data, int cnt)
     case KRB_RESPONSE:
       if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL)
 	{
-	  if (shishi_ap_rep_verify_der (auth_handle, data, cnt) != SHISHI_OK)
+	  if (shishi_ap_rep_verify_der (auth_handle, (char *) data, cnt)
+	      != SHISHI_OK)
 	    {
 	      printf ("[ Mutual authentication failed ]\r\n");
 	      auth_send_retry ();
@@ -395,7 +397,6 @@ int
 krb5shishi_status (TN_Authenticator * ap, char *name, size_t len,
 		   int level)
 {
-  int rc;
   int status;
 
   if (level < AUTH_USER)
@@ -416,11 +417,11 @@ krb5shishi_status (TN_Authenticator * ap, char *name, size_t len,
   return status;
 }
 
-int
+static int
 krb5shishi_is_auth (TN_Authenticator * a, unsigned char *data, int cnt,
 		    char *errbuf, int errbuflen)
 {
-  Shishi_key *key, *key2;
+  Shishi_key *key;
   int rc;
   char *cnamerealm, *server = NULL, *realm = NULL;
   size_t cnamerealmlen;
@@ -530,7 +531,7 @@ krb5shishi_is_auth (TN_Authenticator * a, unsigned char *data, int cnt,
       return 1;
     }
 
-  rc = shishi_ap_req_der_set (auth_handle, data, cnt);
+  rc = shishi_ap_req_der_set (auth_handle, (char *) data, cnt);
   if (rc != SHISHI_OK)
     {
       snprintf (errbuf, errbuflen,
diff --git a/telnet/authenc.c b/telnet/authenc.c
index 3210a0c..e47304f 100644
--- a/telnet/authenc.c
+++ b/telnet/authenc.c
@@ -95,7 +95,7 @@ telnet_spin ()
 char *
 telnet_getenv (char *val)
 {
-  return ((char *) env_getvalue ((unsigned char *) val));
+  return ((char *) env_getvalue (val));
 }
 
 char *

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=9ee96c972996b39b42b880d8e3c4c031440e3324


commit 9ee96c972996b39b42b880d8e3c4c031440e3324
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri May 17 13:54:40 2013 +0200

    ftp, telnet: Erase passwords after use.

diff --git a/ChangeLog b/ChangeLog
index 679cf43..2b000c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2013-05-17  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	ftp, telnet: Erase passwords after use.
+
+	* ftp/cmds.c (user): Erase password string after getpass().
+	(account): Likewise, for account password.
+	* ftp/ftp.c (login): Erase passwords after last use.
+	(command): Print fake account password as debug text.
+
+	* telnet/authenc.c (telnet_gets): Do assignment before
+	if-statement.  Erase string found by getpass().
+
+2013-05-17  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	libtelnet: Let input to printsub functions remain
 	typed as `unsigned char *', but use `char *' for all
 	printable output.
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 93aafcd..ee46508 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -1676,6 +1676,8 @@ user (int argc, char **argv)
       if (argc < 3)
 	argv[2] = getpass ("Password: "), argc++;
       n = command ("PASS %s", argv[2]);
+      if (argv[2])
+	memset (argv[2], 0, strlen (argv[2]));
     }
   if (n == CONTINUE)
     {
@@ -1994,6 +1996,8 @@ account (int argc, char **argv)
       ap = getpass ("Account:");
     }
   command ("ACCT %s", ap);
+  if (ap)
+    memset (ap, 0, strlen (ap));
 }
 
 jmp_buf abortprox;
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 34ef42d..f217f42 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -330,12 +330,16 @@ login (char *host)
       if (pass == NULL)
 	pass = getpass ("Password:");
       n = command ("PASS %s", pass);
+      if (pass)
+	memset (pass, 0, strlen (pass));
     }
   if (n == CONTINUE)
     {
       aflag++;
       acct = getpass ("Account:");
       n = command ("ACCT %s", acct);
+      if (acct)
+	memset (acct, 0, strlen (acct));
     }
   if (n != COMPLETE)
     {
@@ -343,7 +347,10 @@ login (char *host)
       return (0);
     }
   if (!aflag && acct != NULL)
-    command ("ACCT %s", acct);
+    {
+      command ("ACCT %s", acct);
+      memset (acct, 0, strlen (acct));
+    }
   if (proxy)
     return (1);
   for (n = 0; n < macnum; ++n)
@@ -389,6 +396,8 @@ command (const char *fmt, ...)
       va_start (ap, fmt);
       if (strncmp ("PASS ", fmt, 5) == 0)
 	printf ("PASS XXXX");
+      if (strncmp ("ACCT ", fmt, 5) == 0)
+	printf ("ACCT XXXX");
       else
 	vfprintf (stdout, fmt, ap);
       va_end (ap);
diff --git a/telnet/authenc.c b/telnet/authenc.c
index f53d274..3210a0c 100644
--- a/telnet/authenc.c
+++ b/telnet/authenc.c
@@ -114,10 +114,15 @@ telnet_gets (char *prompt, char *result, int length, int echo)
       printf ("%s", prompt);
       res = fgets (result, length, stdin);
     }
-  else if (res = getpass (prompt))
+  else
     {
-      strncpy (result, res, length);
-      res = result;
+      res = getpass (prompt);
+      if (res)
+	{
+	  strncpy (result, res, length);
+	  memset (res, 0, strlen (res));
+	  res = result;
+	}
     }
   TerminalNewMode (om);
   return (res);

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=a98c1047accf76e0264fe76c4644246524aacc0d


commit a98c1047accf76e0264fe76c4644246524aacc0d
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri May 17 12:14:07 2013 +0200

    libtelnet: Standard type for strings.

diff --git a/ChangeLog b/ChangeLog
index c19fdff..679cf43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2013-05-17  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	libtelnet: Let input to printsub functions remain
+	typed as `unsigned char *', but use `char *' for all
+	printable output.
+
+	* libtelnet/auth-proto.h (auth_printsub, auth_sendname)
+	(kerberos4_printsub, kerberos5_printsub)
+	krb5shishi_printsub): Update signatures.
+	* libtelnet/auth.h (TN_Authenticator): Update `*printsub'.
+	* libtelnet/enc-proto.h (encrypt_printsub, krbdes_printsub)
+	(cfb64_printsub, ofb64_printsub): Update signatures.
+	* libtelnet/encrypt.h (Encryptions): Update `*printsub'.
+
+	* libtelnet/auth.c (auth_sendname): Rename first argument
+	and change to `char *'.  New variable CP.
+	(auth_gen_printsub): Change third argument and variables
+	CP and TBUF to `char *'.
+	(auth_printsub): Change third argument to `char *'.
+	* libtelnet/enc_des.c (fb64_printsub, cfb64_printsub)
+	(ofb64_printsub): Likewise.
+	* libtelnet/encrypt.c (encrypt_gen_printsub)
+	(encrypt_printsub): Likewise.
+	* libtelnet/kerberos.c (kerberos4_printsub): Likewise.
+	* libtelnet/kerberos5.c (kerberos5_printsub): Likewise.
+	* libtelnet/shishi.c (krb5shisih_printsub): Likewise.
+
+	* telnetd/utility.c (printsub) [AUTHENTICATION || ENCRYPTION]:
+	Change BUF to `char *'.
+
 2013-05-15  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	rshd: Report client's principal name.
diff --git a/libtelnet/auth-proto.h b/libtelnet/auth-proto.h
index 975a395..1c6e9fe 100644
--- a/libtelnet/auth-proto.h
+++ b/libtelnet/auth-proto.h
@@ -81,8 +81,8 @@ void auth_finished (TN_Authenticator *, int);
 int auth_wait (char *, size_t);
 void auth_name (unsigned char *, int);
 void auth_disable_name (char *);
-void auth_printsub (unsigned char *, int, unsigned char *, int);
-int auth_sendname (unsigned char *, int);
+void auth_printsub (unsigned char *, int, char *, int);
+int auth_sendname (char *, int);
 
 # ifdef	KRB4
 int kerberos4_init (TN_Authenticator *, int);
@@ -90,7 +90,7 @@ int kerberos4_send (TN_Authenticator *);
 void kerberos4_is (TN_Authenticator *, unsigned char *, int);
 void kerberos4_reply (TN_Authenticator *, unsigned char *, int);
 int kerberos4_status (TN_Authenticator *, char *, size_t, int);
-void kerberos4_printsub (unsigned char *, int, unsigned char *, int);
+void kerberos4_printsub (unsigned char *, int, char *, int);
 # endif
 
 # ifdef	KRB5
@@ -99,7 +99,7 @@ int kerberos5_send (TN_Authenticator *);
 void kerberos5_is (TN_Authenticator *, unsigned char *, int);
 void kerberos5_reply (TN_Authenticator *, unsigned char *, int);
 int kerberos5_status (TN_Authenticator *, char *, size_t, int);
-void kerberos5_printsub (unsigned char *, int, unsigned char *, int);
+void kerberos5_printsub (unsigned char *, int, char *, int);
 # endif
 
 # ifdef	SHISHI
@@ -108,7 +108,7 @@ int krb5shishi_send (TN_Authenticator *);
 void krb5shishi_is (TN_Authenticator *, unsigned char *, int);
 void krb5shishi_reply (TN_Authenticator *, unsigned char *, int);
 int krb5shishi_status (TN_Authenticator *, char *, size_t, int);
-void krb5shishi_printsub (unsigned char *, int, unsigned char *, int);
+void krb5shishi_printsub (unsigned char *, int, char *, int);
 void krb5shishi_cleanup (TN_Authenticator *);
 # endif
 #endif
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index e697bb2..13fb824 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -629,12 +629,13 @@ auth_name (unsigned char *data, int cnt)
 }
 
 int
-auth_sendname (unsigned char *cp, int len)
+auth_sendname (char *name, int len)
 {
   static unsigned char str_request[256 + 6]
     = { IAC, SB, TELOPT_AUTHENTICATION, TELQUAL_NAME, };
   register unsigned char *e = str_request + 4;
   register unsigned char *ee = &str_request[sizeof (str_request) - 2];
+  unsigned char *cp = (unsigned char *) name;
 
   while (--len >= 0)
     {
@@ -708,11 +709,11 @@ auth_debug (int mode)
 }
 
 static void
-auth_gen_printsub (unsigned char *data, int cnt, unsigned char *buf,
+auth_gen_printsub (unsigned char *data, int cnt, char *buf,
 		   int buflen)
 {
-  register unsigned char *cp;
-  unsigned char tbuf[16];
+  register char *cp;
+  char tbuf[16];
 
   cnt -= 3;
   data += 3;
@@ -721,7 +722,7 @@ auth_gen_printsub (unsigned char *data, int cnt, unsigned char *buf,
   buflen -= 2;
   for (; cnt > 0; cnt--, data++)
     {
-      sprintf ((char *) tbuf, " %d", *data);
+      sprintf (tbuf, " %d", *data);
       for (cp = tbuf; *cp && buflen > 0; --buflen)
 	*buf++ = *cp++;
       if (buflen <= 0)
@@ -731,7 +732,7 @@ auth_gen_printsub (unsigned char *data, int cnt, unsigned char *buf,
 }
 
 void
-auth_printsub (unsigned char *data, int cnt, unsigned char *buf, int buflen)
+auth_printsub (unsigned char *data, int cnt, char *buf, int buflen)
 {
   TN_Authenticator *ap;
 
diff --git a/libtelnet/auth.h b/libtelnet/auth.h
index 340acb5..59f05d8 100644
--- a/libtelnet/auth.h
+++ b/libtelnet/auth.h
@@ -96,7 +96,7 @@ typedef struct XauthP
   void (*is) (struct XauthP *, unsigned char *, int);
   void (*reply) (struct XauthP *, unsigned char *, int);
   int (*status) (struct XauthP *, char *, size_t, int);
-  void (*printsub) (unsigned char *, int, unsigned char *, int);
+  void (*printsub) (unsigned char *, int, char *, int);
   void (*cleanup) (struct XauthP *);
 } TN_Authenticator;
 
diff --git a/libtelnet/enc-proto.h b/libtelnet/enc-proto.h
index 8632733..ff58dc4 100644
--- a/libtelnet/enc-proto.h
+++ b/libtelnet/enc-proto.h
@@ -102,7 +102,7 @@ void encrypt_send_support (void);
 void encrypt_dec_keyid (unsigned char *, int);
 void encrypt_enc_keyid (unsigned char *, int);
 void encrypt_send_keyid (int, unsigned char *, int, int);
-void encrypt_printsub (unsigned char *, int, unsigned char *, int);
+void encrypt_printsub (unsigned char *, int, char *, int);
 int net_write (unsigned char *, int);
 
 # ifdef	TELNETD
@@ -119,7 +119,7 @@ int krbdes_reply (unsigned char *, int);
 void krbdes_init (int);
 int krbdes_start (int, int);
 void krbdes_session (Session_Key *, int);
-void krbdes_printsub (unsigned char *, int, unsigned char *, int);
+void krbdes_printsub (unsigned char *, int, char *, int);
 
 void cfb64_encrypt (unsigned char *, int);
 int cfb64_decrypt (int);
@@ -129,7 +129,7 @@ int cfb64_is (unsigned char *, int);
 int cfb64_reply (unsigned char *, int);
 void cfb64_session (Session_Key *, int);
 int cfb64_keyid (int, unsigned char *, int *);
-void cfb64_printsub (unsigned char *, int, unsigned char *, int);
+void cfb64_printsub (unsigned char *, int, char *, int);
 
 void ofb64_encrypt (unsigned char *, int);
 int ofb64_decrypt (int);
@@ -139,7 +139,7 @@ int ofb64_is (unsigned char *, int);
 int ofb64_reply (unsigned char *, int);
 void ofb64_session (Session_Key *, int);
 int ofb64_keyid (int, unsigned char *, int *);
-void ofb64_printsub (unsigned char *, int, unsigned char *, int);
+void ofb64_printsub (unsigned char *, int, char *, int);
 
 int des_new_random_key (Block);
 void des_set_random_generator_seed (Block);
diff --git a/libtelnet/enc_des.c b/libtelnet/enc_des.c
index 99450d9..2b348a1 100644
--- a/libtelnet/enc_des.c
+++ b/libtelnet/enc_des.c
@@ -566,7 +566,7 @@ fb64_keyid (int dir, unsigned char *kp, int *lenp, struct fb *fbp)
 
 static void
 fb64_printsub (unsigned char *data, int cnt,
-	       unsigned char *buf, int buflen,
+	       char *buf, int buflen,
 	       const char *type)
 {
   char lbuf[32];
@@ -611,7 +611,7 @@ fb64_printsub (unsigned char *data, int cnt,
 
 void
 cfb64_printsub (unsigned char *data, int cnt,
-		unsigned char *buf, int buflen)
+		char *buf, int buflen)
 {
   fb64_printsub (data, cnt, buf, buflen, "CFB64");
 }
@@ -619,7 +619,7 @@ cfb64_printsub (unsigned char *data, int cnt,
 #   ifdef ENCTYPE_DES_OFB64
 void
 ofb64_printsub (unsigned char *data, int cnt,
-		unsigned char *buf, int buflen)
+		char *buf, int buflen)
 {
   fb64_printsub (data, cnt, buf, buflen, "OFB64");
 }
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index c67e61b..5d59b0c 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -988,7 +988,7 @@ encrypt_debug (int mode)
 
 static void
 encrypt_gen_printsub (unsigned char *data, int cnt,
-		      unsigned char *buf, int buflen)
+		      char *buf, int buflen)
 {
   char tbuf[16], *cp;
 
@@ -1010,7 +1010,7 @@ encrypt_gen_printsub (unsigned char *data, int cnt,
 
 void
 encrypt_printsub (unsigned char *data, int cnt,
-		  unsigned char *buf, int buflen)
+		  char *buf, int buflen)
 {
   Encryptions *ep;
   int type = data[1];
diff --git a/libtelnet/encrypt.h b/libtelnet/encrypt.h
index f65b18f..db4cc4b 100644
--- a/libtelnet/encrypt.h
+++ b/libtelnet/encrypt.h
@@ -142,7 +142,7 @@ typedef struct
   int (*reply) (unsigned char *, int);
   void (*session) (Session_Key *, int);
   int (*keyid) (int, unsigned char *, int *);
-  void (*printsub) (unsigned char *, int, unsigned char *, int);
+  void (*printsub) (unsigned char *, int, char *, int);
 } Encryptions;
 
 #  define SK_DES		1	/* Matched Kerberos v5 KEYTYPE_DES */
diff --git a/libtelnet/kerberos.c b/libtelnet/kerberos.c
index 74179c1..1608d67 100644
--- a/libtelnet/kerberos.c
+++ b/libtelnet/kerberos.c
@@ -498,7 +498,8 @@ kerberos4_status (ap, name, len, level)
 
 void
 kerberos4_printsub (data, cnt, buf, buflen)
-     unsigned char *data, *buf;
+     unsigned char *data;
+     char *buf;
      int cnt, buflen;
 {
   char lbuf[32];
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index 521def6..9ac4ab3 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -745,7 +745,7 @@ req_type_str (int type)
 
 void
 kerberos5_printsub (unsigned char *data, int cnt,
-		    unsigned char *buf, int buflen)
+		    char *buf, int buflen)
 {
   char *p;
   int i;
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index d51ec41..c40b05f 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -683,7 +683,7 @@ req_type_str (int type)
 
 void
 krb5shishi_printsub (unsigned char *data, int cnt,
-		     unsigned char *buf, int buflen)
+		     char *buf, int buflen)
 {
   char *p;
   int i;
diff --git a/telnetd/utility.c b/telnetd/utility.c
index be3507f..729bd5f 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -937,7 +937,7 @@ printsub (int direction, unsigned char *pointer, int length)
   register int i = 0;
 
 #if defined AUTHENTICATION || defined ENCRYPTION
-  unsigned char buf[512];
+  char buf[512];
 #endif
 
   /* Silence unwanted debugging to '/tmp/telnet.debug'.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |   86 ++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac           |   13 +++++++
 ftp/cmds.c             |    4 ++
 ftp/ftp.c              |   11 +++++-
 libtelnet/auth-proto.h |   10 +++---
 libtelnet/auth.c       |   24 +++++++-------
 libtelnet/auth.h       |    2 +-
 libtelnet/enc-proto.h  |    8 ++--
 libtelnet/enc_des.c    |   20 +++++++----
 libtelnet/encrypt.c    |   45 ++++++++++++++++---------
 libtelnet/encrypt.h    |    2 +-
 libtelnet/kerberos.c   |    3 +-
 libtelnet/kerberos5.c  |    6 ++--
 libtelnet/shishi.c     |   25 +++++++-------
 telnet/authenc.c       |   13 +++++--
 telnetd/utility.c      |    2 +-
 16 files changed, 206 insertions(+), 68 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed May 22 06:11:47 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uf61L-00035X-Io
	for mharc-commit-inetutils@gnu.org; Wed, 22 May 2013 06:11:47 -0400
Received: from eggs.gnu.org ([208.118.235.92]:52556)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uf61E-00034u-D5
	for commit-inetutils@gnu.org; Wed, 22 May 2013 06:11:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uf61C-0000gj-EJ
	for commit-inetutils@gnu.org; Wed, 22 May 2013 06:11:40 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:38791)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uf61C-0000gd-B1
	for commit-inetutils@gnu.org; Wed, 22 May 2013 06:11:38 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1Uf61B-0004nJ-Og
	for commit-inetutils@gnu.org; Wed, 22 May 2013 10:11:37 +0000
Date: Wed, 22 May 2013 10:11:37 +0000
Message-Id: <E1Uf61B-0004nJ-Og@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-295-g4b07610
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e9306b9bb186eb8d919ea36a6d8d5e8b3c12c49d
X-Git-Newrev: 4b076100a18fdcf28ed8bc0884dd32c40a918128
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 May 2013 10:11:46 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  4b076100a18fdcf28ed8bc0884dd32c40a918128 (commit)
      from  e9306b9bb186eb8d919ea36a6d8d5e8b3c12c49d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=4b076100a18fdcf28ed8bc0884dd32c40a918128


commit 4b076100a18fdcf28ed8bc0884dd32c40a918128
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed May 22 12:10:54 2013 +0200

    libtelnet: Unused parameters.

diff --git a/ChangeLog b/ChangeLog
index 91b8589..8b8d0a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-05-22  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* libtelnet/encrypt.c: Include <unused-parameter.h>.
+	(encrypt_start, encrypt_request_start): Mark all
+	parameters with _GL_UNUSED_PARAMETER.
+	* libtelnet/kerberos5.c: Include <unused-parameter.h>.
+	(kerberos5_init, kerberos5_status): Param `ap' is unused.
+	* libtelnet/shishi.c: Include <unused-parameter.h>.
+	(krb5shishi_init, krb5shishi_status): `ap' is unused.
+	(krb5shishi_cleanup): Likewise.  Delete variable SUBKEY.
+
 2013-05-18  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	libtelnet: Portability of enctype_names.
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index 41bc631..3a483ee 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -81,6 +81,7 @@
 # include <string.h>
 
 # include <stdio.h>
+# include <unused-parameter.h>
 # include "genget.h"
 
 /* String representation of our capabilities.
@@ -667,7 +668,8 @@ encrypt_reply (unsigned char *data, int cnt)
  * Called when a ENCRYPT START command is received.
  */
 void
-encrypt_start (unsigned char *data, int cnt)
+encrypt_start (unsigned char *data _GL_UNUSED_PARAMETER,
+	       int cnt _GL_UNUSED_PARAMETER)
 {
   Encryptions *ep;
 
@@ -749,7 +751,8 @@ encrypt_request_end (void)
  * can.
  */
 void
-encrypt_request_start (unsigned char *data, int cnt)
+encrypt_request_start (unsigned char *data _GL_UNUSED_PARAMETER,
+		       int cnt _GL_UNUSED_PARAMETER)
 {
   if (encrypt_mode == 0)
     {
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index e1280e9..61491fb 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -36,6 +36,7 @@
 # include <ctype.h>
 # include <syslog.h>
 # include <string.h>
+# include <unused-parameter.h>
 
 # include "auth.h"
 # include "misc.h"
@@ -119,7 +120,7 @@ Data (TN_Authenticator * ap, int type, krb5_pointer d, int c)
 
 /* FIXME: Reverse return code! */
 int
-kerberos5_init (TN_Authenticator * ap, int server)
+kerberos5_init (TN_Authenticator * ap _GL_UNUSED_PARAMETER, int server)
 {
   str_data[3] = server ? TELQUAL_REPLY : TELQUAL_IS;
   if (telnet_context == 0 && krb5_init_context (&telnet_context))
@@ -426,8 +427,8 @@ kerberos5_reply (TN_Authenticator * ap, unsigned char *data, int cnt)
 }
 
 int
-kerberos5_status (TN_Authenticator * ap, char *name, size_t len,
-		  int level)
+kerberos5_status (TN_Authenticator * ap _GL_UNUSED_PARAMETER,
+		  char *name, size_t len, int level)
 {
   if (level < AUTH_USER)
     return level;
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index 34b0446..8574f2a 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -32,6 +32,7 @@
 # include <ctype.h>
 # include <syslog.h>
 # include <string.h>
+# include <unused-parameter.h>
 
 # include "auth.h"
 # include "misc.h"
@@ -100,7 +101,8 @@ Shishi *shishi_telnet = NULL;
 
 /* FIXME: Reverse return code! */
 int
-krb5shishi_init (TN_Authenticator * ap, int server)
+krb5shishi_init (TN_Authenticator * ap _GL_UNUSED_PARAMETER,
+		 int server)
 {
   if (server)
     str_data[3] = TELQUAL_REPLY;
@@ -134,7 +136,7 @@ delayed_shishi_init (void)
 }
 
 void
-krb5shishi_cleanup (TN_Authenticator * ap)
+krb5shishi_cleanup (TN_Authenticator * ap _GL_UNUSED_PARAMETER)
 {
   if (shishi_handle == NULL)
     return;
@@ -150,7 +152,6 @@ krb5shishi_send (TN_Authenticator * ap)
   char type_check[2];
   Shishi_tkt *tkt;
   Shishi_tkts_hint hint;
-  Shishi_key *subkey;
   int rc;
   char *tmp;
   char *apreq;
@@ -394,8 +395,8 @@ krb5shishi_reply (TN_Authenticator * ap, unsigned char *data, int cnt)
 }
 
 int
-krb5shishi_status (TN_Authenticator * ap, char *name, size_t len,
-		   int level)
+krb5shishi_status (TN_Authenticator * ap _GL_UNUSED_PARAMETER,
+		   char *name, size_t len, int level)
 {
   int status;
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |   11 +++++++++++
 libtelnet/encrypt.c   |    7 +++++--
 libtelnet/kerberos5.c |    7 ++++---
 libtelnet/shishi.c    |   11 ++++++-----
 4 files changed, 26 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed May 22 12:12:02 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UfBdy-0005d5-Am
	for mharc-commit-inetutils@gnu.org; Wed, 22 May 2013 12:12:02 -0400
Received: from eggs.gnu.org ([208.118.235.92]:47067)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UfBdp-0005MI-Hh
	for commit-inetutils@gnu.org; Wed, 22 May 2013 12:12:00 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UfBdi-0005xF-9u
	for commit-inetutils@gnu.org; Wed, 22 May 2013 12:11:53 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:39655)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UfBdi-0005x9-5w
	for commit-inetutils@gnu.org; Wed, 22 May 2013 12:11:46 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1UfBdg-0006vP-9Y
	for commit-inetutils@gnu.org; Wed, 22 May 2013 16:11:45 +0000
Date: Wed, 22 May 2013 16:11:44 +0000
Message-Id: <E1UfBdg-0006vP-9Y@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-296-g0b84551
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4b076100a18fdcf28ed8bc0884dd32c40a918128
X-Git-Newrev: 0b845519d6b1922a34921a1c2fb657e637e7b481
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 May 2013 16:12:00 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  0b845519d6b1922a34921a1c2fb657e637e7b481 (commit)
      from  4b076100a18fdcf28ed8bc0884dd32c40a918128 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0b845519d6b1922a34921a1c2fb657e637e7b481


commit 0b845519d6b1922a34921a1c2fb657e637e7b481
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed May 22 18:09:42 2013 +0200

    Mixed compiler warnings.

diff --git a/ChangeLog b/ChangeLog
index 8b8d0a0..d30d523 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,41 @@
 2013-05-22  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	libinetutils: Clarify Kerberos dependency.
+
+	* libinetutils/kcmd.c [KERBEROS || SHISHI]:
+	Condition file content on KERBEROS, not KRB4.
+
+
+	Mixed compiler warnings.
+
+	* ftpd/ftpcmd.y (cmd) <EPRT>: Remove the suffix `LL'
+	on constants, which enforces an unwanted cast.
+	(host_port): Likewise.
+
+	* libinetutils/kcmd.c (kcmd): Cast a string length
+	computation as int, used for format precision.
+
+	* libls/print.c (printlong): Cast nlink_t as int.
+
+	* libtelnet/kerberos5.c (Data): Cast CD as `char *'
+	for use by strlen().
+
+	* src/rexecd.c (get_user_password) [!WITH_PAM]:
+	Declare only in absence of WITH_PAM.
+	(doit) [!WITH_PAM]: Declare NAMEP and PW_PASSWORD.
+	(rexec_conv) [WITH_PAM]: Identify `data' as unused.
+	* src/rlogin.c (writer) <!escapechar>: Disambiguate
+	conditional statements inside a braced block.
+	* src/rsh.c: Include <unused-parameter.h>.  Remove
+	inclusion of "xalloc.h".
+	(parse_opt): Identify `state' as unused.
+	* src/rshd.c (doit) [SHISHI]: Declare ERR_MSG as a
+	constant array.
+
+	* telnet/commands.c (tn) [HAVE_IDN]: Declare HOSTTMP.
+
+2013-05-22  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	* libtelnet/encrypt.c: Include <unused-parameter.h>.
 	(encrypt_start, encrypt_request_start): Mark all
 	parameters with _GL_UNUSED_PARAMETER.
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index 085a5bd..bb62c75 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -639,7 +639,7 @@ cmd
 				struct addrinfo hints, *res;
 
 				memset (&hints, 0, sizeof (hints));
-				snprintf (p, sizeof (p), "%jd", $9 & 0xffffLL);
+				snprintf (p, sizeof (p), "%jd", $9 & 0xffff);
 				hints.ai_family = $5;
 				hints.ai_socktype = SOCK_STREAM;
 				hints.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV;
@@ -909,10 +909,10 @@ host_port
 			struct addrinfo hints, *res;
 
 			snprintf (a, sizeof (a), "%jd.%jd.%jd.%jd",
-				  $1 & 0xffLL, $3 & 0xffLL,
-				  $5 & 0xffLL, $7 & 0xffLL);
+				  $1 & 0xff, $3 & 0xff,
+				  $5 & 0xff, $7 & 0xff);
 			snprintf (p, sizeof (p), "%jd",
-				  (($9 & 0xffLL) << 8) + ($11 & 0xffLL));
+				  (($9 & 0xff) << 8) + ($11 & 0xff));
 			memset (&hints, 0, sizeof (hints));
 			hints.ai_family = his_addr.ss_family;
 			hints.ai_socktype = SOCK_STREAM;
@@ -927,8 +927,8 @@ host_port
 #endif
 			    snprintf (a, sizeof (a),
 				      "::ffff:%jd.%jd.%jd.%jd",
-				      $1 & 0xffLL, $3 & 0xffLL,
-				      $5 & 0xffLL, $7 & 0xffLL);
+				      $1 & 0xff, $3 & 0xff,
+				      $5 & 0xff, $7 & 0xff);
 			  }
 
 			err = getaddrinfo (a, p, &hints, &res);
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 325c92b..972cef7 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -49,7 +49,7 @@
 
 #include <config.h>
 
-#if defined KRB4 || defined SHISHI
+#if defined KERBEROS || defined SHISHI
 
 # include <sys/param.h>
 # include <sys/file.h>
@@ -208,7 +208,7 @@ kcmd (Shishi ** h, int *sock, char **ahost, unsigned short rport, char *locuser,
        * and concatenate the host's canonical name, but
        * preceeded by a slash.
        */
-      sprintf (p, "%.*s/%s", host - *ahost - 1, *ahost, host_save);
+      sprintf (p, "%.*s/%s", (int) (host - *ahost - 1), *ahost, host_save);
       *ahost = p;
     }
 
@@ -569,4 +569,4 @@ getport (int *alport, int af)
     }
 }
 
-#endif /* KERBEROS */
+#endif /* KERBEROS || SHISHI */
diff --git a/libls/print.c b/libls/print.c
index 062aca6..daf68a9 100644
--- a/libls/print.c
+++ b/libls/print.c
@@ -132,8 +132,9 @@ printlong (DISPLAY *dp)
 		dp->s_block, (long long) howmany (sp->st_blocks, blocksize));
       strmode (sp->st_mode, buf);
       np = p->fts_pointer;
-      printf ("%s %*u %-*s  %-*s  ", buf, dp->s_nlink,
-	      sp->st_nlink, dp->s_user, np->user, dp->s_group, np->group);
+      printf ("%s %*d %-*s  %-*s  ",
+	      buf, dp->s_nlink, (int) sp->st_nlink,
+	      dp->s_user, np->user, dp->s_group, np->group);
       if (f_flags)
 	printf ("%-*s ", dp->s_flags, np->flags);
       if (S_ISCHR (sp->st_mode) || S_ISBLK (sp->st_mode))
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index 61491fb..62764ec 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -91,7 +91,7 @@ Data (TN_Authenticator * ap, int type, krb5_pointer d, int c)
   unsigned char *cd = (unsigned char *) d;
 
   if (c == -1)
-    c = strlen (cd);
+    c = strlen ((char *) cd);
 
   if (auth_debug_mode)
     {
diff --git a/src/rexecd.c b/src/rexecd.c
index 15bee0e..8de6a58 100644
--- a/src/rexecd.c
+++ b/src/rexecd.c
@@ -221,6 +221,7 @@ extern char **environ;
 
 char *getstr (const char *);
 
+#ifndef WITH_PAM
 static char *
 get_user_password (struct passwd *pwd)
 {
@@ -232,12 +233,16 @@ get_user_password (struct passwd *pwd)
 #endif
   return pw_text;
 }
+#endif /* !WITH_PAM */
 
 int
 doit (int f, struct sockaddr *fromp, socklen_t fromlen)
 {
-  char *cmdbuf, *cp, *namep;
-  char *user, *pass, *pw_password;
+  char *cmdbuf, *cp;
+  char *user, *pass;
+#ifndef WITH_PAM
+  char *namep, *pw_password;
+#endif
 #ifdef HAVE_GETPWNAM_R
   char *pwbuf;
   int pwbuflen;
@@ -365,7 +370,7 @@ doit (int f, struct sockaddr *fromp, socklen_t fromlen)
 
   endpwent ();
 
-#if !WITH_PAM
+#ifndef WITH_PAM
   /* Last need of elevated privilege.  */
   pw_password = get_user_password (pwd);
   if (*pw_password != '\0')
@@ -710,7 +715,8 @@ getstr (const char *err)
  */
 static int
 rexec_conv (int num, const struct pam_message **pam_msg,
-	    struct pam_response **pam_resp, void *data)
+	    struct pam_response **pam_resp,
+	    void *data _GL_UNUSED_PARAMETER)
 {
   struct pam_response *resp;
 
diff --git a/src/rlogin.c b/src/rlogin.c
index b80aa90..b2a1f27 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -1020,19 +1020,21 @@ writer (void)
 	      continue;
 	    }
 	  if (c != escapechar)
+	    {
 #ifdef ENCRYPTION
 # ifdef KERBEROS
-	    if (doencrypt)
-	      des_write (rem, (char *) &escapechar, 1);
-	    else
+	      if (doencrypt)
+		des_write (rem, (char *) &escapechar, 1);
+	      else
 # elif defined(SHISHI)
-	    if (doencrypt)
-	      writeenc (handle, rem, (char *) &escapechar, 1, &wlen, &iv2,
-			key, 2);
-	    else
-# endif
-#endif
-	      write (rem, &escapechar, 1);
+	      if (doencrypt)
+		writeenc (handle, rem, (char *) &escapechar, 1, &wlen,
+			  &iv2, key, 2);
+	      else
+# endif /* SHISHI */
+#endif /* ENCRYPTION */
+		write (rem, &escapechar, 1);
+	    }
 	}
 
 #ifdef ENCRYPTION
diff --git a/src/rsh.c b/src/rsh.c
index 94827c6..abfcb50 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -77,7 +77,7 @@
 #include <xalloc.h>
 #include <argp.h>
 #include <libinetutils.h>
-#include "xalloc.h"
+#include <unused-parameter.h>
 
 #ifdef KERBEROS
 # ifdef HAVE_KERBEROSIV_DES_H
@@ -171,7 +171,8 @@ static struct argp_option options[] = {
 };
 
 static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
+parse_opt (int key, char *arg,
+	   struct argp_state *state _GL_UNUSED_PARAMETER)
 {
   switch (key)
     {
diff --git a/src/rshd.c b/src/rshd.c
index 1108401..7b518b8 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -958,7 +958,7 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
   if (use_kerberos)
     {
       int rc;
-      char *err_msg;
+      const char *err_msg;
 
       rc = get_auth (STDIN_FILENO, &h, &ap, &enckey, &err_msg, &protocol,
 		     &cksumtype, &cksum, &cksumlen, servername);
diff --git a/telnet/commands.c b/telnet/commands.c
index 8553771..a586018 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -2450,7 +2450,10 @@ tn (int argc, char *argv[])
 #endif
   const int on = 1;
   int err;
-  char *cmd, *hostp = 0, *hosttmp = 0, *portp = 0, *user = 0;
+  char *cmd, *hostp = 0, *portp = 0, *user = 0;
+#ifdef HAVE_IDN
+  char *hosttmp = 0;
+#endif
 
 #ifdef IPV6
   memset (&hints, 0, sizeof (hints));

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |   36 ++++++++++++++++++++++++++++++++++++
 ftpd/ftpcmd.y         |   12 ++++++------
 libinetutils/kcmd.c   |    6 +++---
 libls/print.c         |    5 +++--
 libtelnet/kerberos5.c |    2 +-
 src/rexecd.c          |   14 ++++++++++----
 src/rlogin.c          |   22 ++++++++++++----------
 src/rsh.c             |    5 +++--
 src/rshd.c            |    2 +-
 telnet/commands.c     |    5 ++++-
 10 files changed, 79 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed May 22 15:08:15 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UfEOV-0005LH-Rj
	for mharc-commit-inetutils@gnu.org; Wed, 22 May 2013 15:08:15 -0400
Received: from eggs.gnu.org ([208.118.235.92]:55586)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UfEO5-0004wb-0p
	for commit-inetutils@gnu.org; Wed, 22 May 2013 15:08:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UfENt-0006Nw-OU
	for commit-inetutils@gnu.org; Wed, 22 May 2013 15:07:48 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60797)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UfENt-0006Nq-Ia
	for commit-inetutils@gnu.org; Wed, 22 May 2013 15:07:37 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1UfENt-0006oU-2d
	for commit-inetutils@gnu.org; Wed, 22 May 2013 19:07:37 +0000
Date: Wed, 22 May 2013 19:07:37 +0000
Message-Id: <E1UfENt-0006oU-2d@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-297-gd1d52cc
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0b845519d6b1922a34921a1c2fb657e637e7b481
X-Git-Newrev: d1d52cce92dd289b800ec922d77b0b4cd4c83fdc
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 May 2013 19:08:14 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  d1d52cce92dd289b800ec922d77b0b4cd4c83fdc (commit)
      from  0b845519d6b1922a34921a1c2fb657e637e7b481 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=d1d52cce92dd289b800ec922d77b0b4cd4c83fdc


commit d1d52cce92dd289b800ec922d77b0b4cd4c83fdc
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed May 22 21:03:41 2013 +0200

    Update copyright years with 2013. (silent change)

diff --git a/ChangeLog b/ChangeLog
index d30d523..2f4bac5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14000,7 +14000,7 @@ russion letters.  Thanks to Vladas Lapinskas <lapinskas@mail.iae.lt>.
 	(main): Add option -V (version).
 
     Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-    2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+    2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ChangeLog.0 b/ChangeLog.0
index 89b5bd6..47abd63 100644
--- a/ChangeLog.0
+++ b/ChangeLog.0
@@ -2022,8 +2022,8 @@ Sat Dec 30 06:36:41 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 	disable idle timer.
 
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-    2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-    Foundation, Inc.
+    2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+    Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/Makefile.am b/Makefile.am
index 0c78a7b..8bc610a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/NEWS b/NEWS
index 6a60b90..fd76abb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 GNU inetutils NEWS -- history of user-visible changes.
 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-See the end of this file for license conditions.
+2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+Foundation, Inc.  See the end of this file for license conditions.
 
 Please send inetutils bug reports to <bug-inetutils@gnu.org>.
 
diff --git a/README b/README
index 760b18b..920183f 100644
--- a/README
+++ b/README
@@ -66,7 +66,8 @@ Please send all bug reports to <bug-inetutils@gnu.org>.
 ========================================================================
 
 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/README-alpha b/README-alpha
index a5605d2..d311ead 100644
--- a/README-alpha
+++ b/README-alpha
@@ -1,6 +1,6 @@
 This is the GNU Inetutils package.
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 See end of file for copying conditions.
 
 This document describes the actions needed to build GNU inetutils from
diff --git a/THANKS b/THANKS
index f42a136..ce56e9a 100644
--- a/THANKS
+++ b/THANKS
@@ -37,7 +37,8 @@ Todd R. Eigenschink <todd@tekinteractive.com>
 ========================================================================
 
 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/bootstrap.conf b/bootstrap.conf
index 98a8637..dfed69b 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,5 +1,5 @@
 # bootstrap.conf - Bootstrap configuration.
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
 # Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
diff --git a/cfg.mk b/cfg.mk
index bb95788..917c7d7 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/configure.ac b/configure.ac
index 994b3e8..556bc0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # configure.ac - Configuration for inetutils
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
 # Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b93ebd6..dc434ef 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 1843fd3..a39e400 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -60,7 +60,8 @@
 This manual documents version @value{VERSION} of the @sc{gnu} networking
 utilities.
 
-Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/ftp/Makefile.am b/ftp/Makefile.am
index cedfa70..5589154 100644
--- a/ftp/Makefile.am
+++ b/ftp/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ftp/cmds.c b/ftp/cmds.c
index ee46508..45c870a 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/cmdtab.c b/ftp/cmdtab.c
index 6615ee8..d872d36 100644
--- a/ftp/cmdtab.c
+++ b/ftp/cmdtab.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/domacro.c b/ftp/domacro.c
index cc49b88..9cad900 100644
--- a/ftp/domacro.c
+++ b/ftp/domacro.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/extern.h b/ftp/extern.h
index 9117eb8..8acd0f7 100644
--- a/ftp/extern.h
+++ b/ftp/extern.h
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/ftp.c b/ftp/ftp.c
index f217f42..7e3e41e 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/ftp_var.h b/ftp/ftp_var.h
index 224669a..499ad36 100644
--- a/ftp/ftp_var.h
+++ b/ftp/ftp_var.h
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/main.c b/ftp/main.c
index c01ba82..9fe0f01 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/ruserpass.c b/ftp/ruserpass.c
index f974cdc..1bf9b41 100644
--- a/ftp/ruserpass.c
+++ b/ftp/ruserpass.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/Makefile.am b/ftpd/Makefile.am
index a6dc2a3..aacc380 100644
--- a/ftpd/Makefile.am
+++ b/ftpd/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ftpd/auth.c b/ftpd/auth.c
index d7a55ef..ed6f697 100644
--- a/ftpd/auth.c
+++ b/ftpd/auth.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/conf.c b/ftpd/conf.c
index 731d901..6c87cd4 100644
--- a/ftpd/conf.c
+++ b/ftpd/conf.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/extern.h b/ftpd/extern.h
index a379fe7..5005484 100644
--- a/ftpd/extern.h
+++ b/ftpd/extern.h
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+  Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index bb62c75..d4b5d89 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+  Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 1a1eac0..964ca2c 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+  Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/logwtmp.c b/ftpd/logwtmp.c
index 576763f..7c7b90e 100644
--- a/ftpd/logwtmp.c
+++ b/ftpd/logwtmp.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/ftpd/pam.c b/ftpd/pam.c
index 14ed2cb..91382f8 100644
--- a/ftpd/pam.c
+++ b/ftpd/pam.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/popen.c b/ftpd/popen.c
index f67d4e2..f525f93 100644
--- a/ftpd/popen.c
+++ b/ftpd/popen.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+  Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/server_mode.c b/ftpd/server_mode.c
index 6b304d7..395c657 100644
--- a/ftpd/server_mode.c
+++ b/ftpd/server_mode.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/Makefile.am b/ifconfig/Makefile.am
index 89dec27..e777e52 100644
--- a/ifconfig/Makefile.am
+++ b/ifconfig/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ifconfig/changeif.c b/ifconfig/changeif.c
index fbe7fe8..da29f08 100644
--- a/ifconfig/changeif.c
+++ b/ifconfig/changeif.c
@@ -1,6 +1,6 @@
 /* changeif.c -- change the configuration of a network interface
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/flags.c b/ifconfig/flags.c
index 6d5a573..7069997 100644
--- a/ifconfig/flags.c
+++ b/ifconfig/flags.c
@@ -1,6 +1,6 @@
 /* flags.c -- network interface flag handling
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/flags.h b/ifconfig/flags.h
index 0662a49..d06245c 100644
--- a/ifconfig/flags.h
+++ b/ifconfig/flags.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/ifconfig.c b/ifconfig/ifconfig.c
index a8abdb1..810852c 100644
--- a/ifconfig/ifconfig.c
+++ b/ifconfig/ifconfig.c
@@ -1,6 +1,6 @@
 /* ifconfig.c -- network interface configuration utility
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/ifconfig.h b/ifconfig/ifconfig.h
index 6fb61d2..b97a395 100644
--- a/ifconfig/ifconfig.h
+++ b/ifconfig/ifconfig.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/options.c b/ifconfig/options.c
index c49163d..25d89db 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -1,6 +1,6 @@
 /* options.c -- process the command line options
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/options.h b/ifconfig/options.h
index 1cbfdb7..4fc497e 100644
--- a/ifconfig/options.h
+++ b/ifconfig/options.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index 5dbd8c5..4883539 100644
--- a/ifconfig/printif.c
+++ b/ifconfig/printif.c
@@ -1,6 +1,6 @@
 /* printif.c -- print an interface configuration
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/printif.h b/ifconfig/printif.h
index 7f543c0..e378349 100644
--- a/ifconfig/printif.h
+++ b/ifconfig/printif.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system.c b/ifconfig/system.c
index d8d1bf4..0fd5ad8 100644
--- a/ifconfig/system.c
+++ b/ifconfig/system.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system.h b/ifconfig/system.h
index 2352081..7ff5f56 100644
--- a/ifconfig/system.h
+++ b/ifconfig/system.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/Makefile.am b/ifconfig/system/Makefile.am
index b6ffd40..320bdb7 100644
--- a/ifconfig/system/Makefile.am
+++ b/ifconfig/system/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ifconfig/system/bsd.c b/ifconfig/system/bsd.c
index adf8945..a42da42 100644
--- a/ifconfig/system/bsd.c
+++ b/ifconfig/system/bsd.c
@@ -1,6 +1,6 @@
 /* bsd.c -- BSD specific code for ifconfig
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/bsd.h b/ifconfig/system/bsd.h
index 75cdae1..5b1b866 100644
--- a/ifconfig/system/bsd.h
+++ b/ifconfig/system/bsd.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/generic.c b/ifconfig/system/generic.c
index 7205fe5..5311763 100644
--- a/ifconfig/system/generic.c
+++ b/ifconfig/system/generic.c
@@ -1,6 +1,6 @@
 /* generic.c -- generic system code for ifconfig
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/generic.h b/ifconfig/system/generic.h
index 986226f..82a868b 100644
--- a/ifconfig/system/generic.h
+++ b/ifconfig/system/generic.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
index d676af5..ece2f78 100644
--- a/ifconfig/system/linux.c
+++ b/ifconfig/system/linux.c
@@ -1,6 +1,6 @@
 /* linux.c -- Linux specific code for ifconfig
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/linux.h b/ifconfig/system/linux.h
index 50f2dde..f909d17 100644
--- a/ifconfig/system/linux.h
+++ b/ifconfig/system/linux.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/qnx.c b/ifconfig/system/qnx.c
index e03e89f..f329661 100644
--- a/ifconfig/system/qnx.c
+++ b/ifconfig/system/qnx.c
@@ -1,6 +1,6 @@
 /* qnx.c -- QNX specific code for ifconfig
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/qnx.h b/ifconfig/system/qnx.h
index f814410..2ad1ba6 100644
--- a/ifconfig/system/qnx.h
+++ b/ifconfig/system/qnx.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/solaris.c b/ifconfig/system/solaris.c
index c4da17e..d844509 100644
--- a/ifconfig/system/solaris.c
+++ b/ifconfig/system/solaris.c
@@ -1,6 +1,6 @@
 /* solaris.c -- Solaris specific code for ifconfig
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/solaris.h b/ifconfig/system/solaris.h
index ed06d57..766e87b 100644
--- a/ifconfig/system/solaris.h
+++ b/ifconfig/system/solaris.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/Makefile.am b/libicmp/Makefile.am
index 7ff2ec2..8d0b0a9 100644
--- a/libicmp/Makefile.am
+++ b/libicmp/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-# 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libicmp/icmp.h b/libicmp/icmp.h
index 67ce1f0..d0f5db6 100644
--- a/libicmp/icmp.h
+++ b/libicmp/icmp.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_address.c b/libicmp/icmp_address.c
index ef19490..a8f740f 100644
--- a/libicmp/icmp_address.c
+++ b/libicmp/icmp_address.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_cksum.c b/libicmp/icmp_cksum.c
index 1cc7955..3b3027c 100644
--- a/libicmp/icmp_cksum.c
+++ b/libicmp/icmp_cksum.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_echo.c b/libicmp/icmp_echo.c
index 5eb3230..c4b7256 100644
--- a/libicmp/icmp_echo.c
+++ b/libicmp/icmp_echo.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_timestamp.c b/libicmp/icmp_timestamp.c
index caa71fb..31b513d 100644
--- a/libicmp/icmp_timestamp.c
+++ b/libicmp/icmp_timestamp.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/Makefile.am b/libinetutils/Makefile.am
index db98f38..a5d2d4c 100644
--- a/libinetutils/Makefile.am
+++ b/libinetutils/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libinetutils/argcv.c b/libinetutils/argcv.c
index ceab19b..8714829 100644
--- a/libinetutils/argcv.c
+++ b/libinetutils/argcv.c
@@ -1,6 +1,6 @@
 /* argcv.c - simple functions for parsing input based on whitespace
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/argcv.h b/libinetutils/argcv.h
index 807ad01..4eaeca8 100644
--- a/libinetutils/argcv.h
+++ b/libinetutils/argcv.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/cleansess.c b/libinetutils/cleansess.c
index 5be83ce..b3ced06 100644
--- a/libinetutils/cleansess.c
+++ b/libinetutils/cleansess.c
@@ -1,6 +1,6 @@
 /* cleansess.c - Clean up the pty and frob utmp/wtmp accordingly after logout
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libinetutils/daemon.c b/libinetutils/daemon.c
index 9a20442..af4a383 100644
--- a/libinetutils/daemon.c
+++ b/libinetutils/daemon.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libinetutils/defauthors.c b/libinetutils/defauthors.c
index 34d918f..b06681b 100644
--- a/libinetutils/defauthors.c
+++ b/libinetutils/defauthors.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/des_rw.c b/libinetutils/des_rw.c
index 9485f45..603f82c 100644
--- a/libinetutils/des_rw.c
+++ b/libinetutils/des_rw.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-  Inc.
+  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/if_index.c b/libinetutils/if_index.c
index a063101..ae3e56f 100644
--- a/libinetutils/if_index.c
+++ b/libinetutils/if_index.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 972cef7..22bb842 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-  Inc.
+  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/krcmd.c b/libinetutils/krcmd.c
index 76f28aa..6e691e6 100644
--- a/libinetutils/krcmd.c
+++ b/libinetutils/krcmd.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-  Inc.
+  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/libinetutils.h b/libinetutils/libinetutils.h
index 617cf5c..bef40a8 100644
--- a/libinetutils/libinetutils.h
+++ b/libinetutils/libinetutils.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/localhost.c b/libinetutils/localhost.c
index 14e17d6..24a0a32 100644
--- a/libinetutils/localhost.c
+++ b/libinetutils/localhost.c
@@ -1,6 +1,6 @@
 /* localhost.c - A slightly more convenient wrapper for gethostname
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libinetutils/logwtmp.c b/libinetutils/logwtmp.c
index d859efe..2a9caba 100644
--- a/libinetutils/logwtmp.c
+++ b/libinetutils/logwtmp.c
@@ -1,6 +1,6 @@
 /* logwtmp.c - A version of BSDs `logwtmp' that should be widely portable
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
+  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation,
   Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libinetutils/logwtmpko.c b/libinetutils/logwtmpko.c
index a40ad07..bf30838 100644
--- a/libinetutils/logwtmpko.c
+++ b/libinetutils/logwtmpko.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-  Inc.
+  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/setsig.c b/libinetutils/setsig.c
index 10271e8..551b8a4 100644
--- a/libinetutils/setsig.c
+++ b/libinetutils/setsig.c
@@ -1,7 +1,7 @@
 /* setsig.c - Set a signal handler, trying to turning on the SA_RESTART bit
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-  Inc.
+  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/shishi.c b/libinetutils/shishi.c
index 21e375b..0390189 100644
--- a/libinetutils/shishi.c
+++ b/libinetutils/shishi.c
@@ -1,6 +1,6 @@
 /* shishi.c -- functions to use kerberos V with shishi
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/shishi_def.h b/libinetutils/shishi_def.h
index 5dfd139..e1988bd 100644
--- a/libinetutils/shishi_def.h
+++ b/libinetutils/shishi_def.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+  Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/tftpsubs.c b/libinetutils/tftpsubs.c
index 141e655..b10c3b7 100644
--- a/libinetutils/tftpsubs.c
+++ b/libinetutils/tftpsubs.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/tftpsubs.h b/libinetutils/tftpsubs.h
index 0296ff2..a498171 100644
--- a/libinetutils/tftpsubs.h
+++ b/libinetutils/tftpsubs.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/ttymsg.c b/libinetutils/ttymsg.c
index 8d4e0b2..758f3e9 100644
--- a/libinetutils/ttymsg.c
+++ b/libinetutils/ttymsg.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libinetutils/utmp_init.c b/libinetutils/utmp_init.c
index 6cbfd10..445b3f7 100644
--- a/libinetutils/utmp_init.c
+++ b/libinetutils/utmp_init.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-  2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/utmp_logout.c b/libinetutils/utmp_logout.c
index 3ef74d6..ff0955d 100644
--- a/libinetutils/utmp_logout.c
+++ b/libinetutils/utmp_logout.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-  2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/Makefile.am b/libls/Makefile.am
index 202596d..5aa3959 100644
--- a/libls/Makefile.am
+++ b/libls/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libls/cmp.c b/libls/cmp.c
index 28d4024..e4db9b0 100644
--- a/libls/cmp.c
+++ b/libls/cmp.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/extern.h b/libls/extern.h
index b777d28..eecf905 100644
--- a/libls/extern.h
+++ b/libls/extern.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/fts.c b/libls/fts.c
index 97447fd..a547cbb 100644
--- a/libls/fts.c
+++ b/libls/fts.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/fts.h b/libls/fts.h
index 12fd3b4..9c2d477 100644
--- a/libls/fts.h
+++ b/libls/fts.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/ls.c b/libls/ls.c
index e515179..8a0fe00 100644
--- a/libls/ls.c
+++ b/libls/ls.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/ls.h b/libls/ls.h
index eda1e90..e0d05e7 100644
--- a/libls/ls.h
+++ b/libls/ls.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/print.c b/libls/print.c
index daf68a9..49cd56c 100644
--- a/libls/print.c
+++ b/libls/print.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/stat_flags.c b/libls/stat_flags.c
index e47383b..1ea0c3c 100644
--- a/libls/stat_flags.c
+++ b/libls/stat_flags.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/util.c b/libls/util.c
index 96611c1..dc8f1b5 100644
--- a/libls/util.c
+++ b/libls/util.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/Makefile.am b/libtelnet/Makefile.am
index ba8b28e..173c635 100644
--- a/libtelnet/Makefile.am
+++ b/libtelnet/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libtelnet/auth-proto.h b/libtelnet/auth-proto.h
index 1c6e9fe..b19bad2 100644
--- a/libtelnet/auth-proto.h
+++ b/libtelnet/auth-proto.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index e502b3c..b178e53 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/auth.h b/libtelnet/auth.h
index 59f05d8..13aab43 100644
--- a/libtelnet/auth.h
+++ b/libtelnet/auth.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/enc-proto.h b/libtelnet/enc-proto.h
index ff58dc4..44c64bd 100644
--- a/libtelnet/enc-proto.h
+++ b/libtelnet/enc-proto.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/enc_des.c b/libtelnet/enc_des.c
index 3ad0df6..7549ff1 100644
--- a/libtelnet/enc_des.c
+++ b/libtelnet/enc_des.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index 3a483ee..69f31b6 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/encrypt.h b/libtelnet/encrypt.h
index db4cc4b..6e83eb3 100644
--- a/libtelnet/encrypt.h
+++ b/libtelnet/encrypt.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/forward.c b/libtelnet/forward.c
index 3da40e4..3bc90bf 100644
--- a/libtelnet/forward.c
+++ b/libtelnet/forward.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-  Inc.
+  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/genget.c b/libtelnet/genget.c
index d2b77fe..5a69508 100644
--- a/libtelnet/genget.c
+++ b/libtelnet/genget.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/genget.h b/libtelnet/genget.h
index 0b56f7d..2f87fb4 100644
--- a/libtelnet/genget.h
+++ b/libtelnet/genget.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/getent.c b/libtelnet/getent.c
index 1853cff..bcadc61 100644
--- a/libtelnet/getent.c
+++ b/libtelnet/getent.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/kerberos.c b/libtelnet/kerberos.c
index 1608d67..8dab1f4 100644
--- a/libtelnet/kerberos.c
+++ b/libtelnet/kerberos.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index 62764ec..525905e 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/key-proto.h b/libtelnet/key-proto.h
index 010fdb3..232a07b 100644
--- a/libtelnet/key-proto.h
+++ b/libtelnet/key-proto.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/misc-proto.h b/libtelnet/misc-proto.h
index e2cbef9..a6854cb 100644
--- a/libtelnet/misc-proto.h
+++ b/libtelnet/misc-proto.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/misc.c b/libtelnet/misc.c
index 45cf3b9..056f7b0 100644
--- a/libtelnet/misc.c
+++ b/libtelnet/misc.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/misc.h b/libtelnet/misc.h
index ec18a3f..3f7bb69 100644
--- a/libtelnet/misc.h
+++ b/libtelnet/misc.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/read_passwd.c b/libtelnet/read_passwd.c
index 1cbce5d..838ff40 100644
--- a/libtelnet/read_passwd.c
+++ b/libtelnet/read_passwd.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-  Inc.
+  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index 8574f2a..6fbf421 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-  2012 Free Software Foundation, Inc.
+  2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/man/Makefile.am b/man/Makefile.am
index c39f8a1..5327f1b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,6 @@
 #
-# Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/paths b/paths
index 8a61652..8808b49 100644
--- a/paths
+++ b/paths
@@ -1,6 +1,6 @@
 # paths - Paths for inetutils
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
 # Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
diff --git a/ping/Makefile.am b/ping/Makefile.am
index 99e04a9..72ad307 100644
--- a/ping/Makefile.am
+++ b/ping/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ping/libping.c b/ping/libping.c
index 6bcbe8e..ba7d713 100644
--- a/ping/libping.c
+++ b/ping/libping.c
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-  Inc.
+  Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping.c b/ping/ping.c
index 5da4d99..6952e94 100644
--- a/ping/ping.c
+++ b/ping/ping.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping.h b/ping/ping.h
index a6fe6b3..03552b3 100644
--- a/ping/ping.h
+++ b/ping/ping.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-  Inc.
+  Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping6.c b/ping/ping6.c
index cb37f3f..7cdf991 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+  Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping6.h b/ping/ping6.h
index 93a1922..f7902ab 100644
--- a/ping/ping6.h
+++ b/ping/ping6.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+  Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_address.c b/ping/ping_address.c
index 35bc4ba..1873572 100644
--- a/ping/ping_address.c
+++ b/ping/ping_address.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_common.c b/ping/ping_common.c
index 623fd9c..fee5d08 100644
--- a/ping/ping_common.c
+++ b/ping/ping_common.c
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+  Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_common.h b/ping/ping_common.h
index 6485252..908e3c5 100644
--- a/ping/ping_common.h
+++ b/ping/ping_common.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+  Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_echo.c b/ping/ping_echo.c
index e83ccff..81e49e0 100644
--- a/ping/ping_echo.c
+++ b/ping/ping_echo.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_impl.h b/ping/ping_impl.h
index 91b8b87..be62d16 100644
--- a/ping/ping_impl.h
+++ b/ping/ping_impl.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_router.c b/ping/ping_router.c
index 0d8f3d8..1d16368 100644
--- a/ping/ping_router.c
+++ b/ping/ping_router.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_timestamp.c b/ping/ping_timestamp.c
index 3d59f95..8ecfec2 100644
--- a/ping/ping_timestamp.c
+++ b/ping/ping_timestamp.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 189df7e..8b84d7b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/src/dnsdomainname.c b/src/dnsdomainname.c
index 6b8912e..43707f6 100644
--- a/src/dnsdomainname.c
+++ b/src/dnsdomainname.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2012 Free Software Foundation, Inc.
+  Copyright (C) 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/hostname.c b/src/hostname.c
index 83cd564..4e59445 100644
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -1,6 +1,6 @@
 /*
-   Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-   Inc.
+   Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+   Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/inetd.c b/src/inetd.c
index 5c720de..98b8a58 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
   Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/src/logger.c b/src/logger.c
index 957843d..d0d16bc 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/logprio.h b/src/logprio.h
index c9f0b2b..4e98d3a 100644
--- a/src/logprio.h
+++ b/src/logprio.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+  Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rcp.c b/src/rcp.c
index 0bfb826..094f7a8 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rexec.c b/src/rexec.c
index 03d8ea9..05e358a 100644
--- a/src/rexec.c
+++ b/src/rexec.c
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rexecd.c b/src/rexecd.c
index 8de6a58..360684b 100644
--- a/src/rexecd.c
+++ b/src/rexecd.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rlogin.c b/src/rlogin.c
index b2a1f27..f160a5f 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rlogind.c b/src/rlogind.c
index cb81cec..db1ce15 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rsh.c b/src/rsh.c
index abfcb50..f0e09ae 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/rshd.c b/src/rshd.c
index 7b518b8..cfad200 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
   Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/src/syslogd.c b/src/syslogd.c
index fc633a8..bbdca48 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -1,7 +1,7 @@
 /* syslogd - log system messages
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-  Inc.
+  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/tftp.c b/src/tftp.c
index c6d0424..2d66322 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/tftpd.c b/src/tftpd.c
index 2492f3e..30d82a7 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/src/traceroute.c b/src/traceroute.c
index 63c6474..132de9f 100644
--- a/src/traceroute.c
+++ b/src/traceroute.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/src/uucpd.c b/src/uucpd.c
index 4ff6295..4467d6c 100644
--- a/src/uucpd.c
+++ b/src/uucpd.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/Makefile.am b/talk/Makefile.am
index e42a274..a3edb2e 100644
--- a/talk/Makefile.am
+++ b/talk/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/talk/ctl.c b/talk/ctl.c
index 5d3ba2e..d28e5cb 100644
--- a/talk/ctl.c
+++ b/talk/ctl.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/ctl_transact.c b/talk/ctl_transact.c
index 2a50942..9e6c7a1 100644
--- a/talk/ctl_transact.c
+++ b/talk/ctl_transact.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/display.c b/talk/display.c
index 64b77f3..3978b82 100644
--- a/talk/display.c
+++ b/talk/display.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/get_addrs.c b/talk/get_addrs.c
index ed4d174..47c83fc 100644
--- a/talk/get_addrs.c
+++ b/talk/get_addrs.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/get_names.c b/talk/get_names.c
index 67957f1..dd46a3d 100644
--- a/talk/get_names.c
+++ b/talk/get_names.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/init_disp.c b/talk/init_disp.c
index a878222..fa65d4c 100644
--- a/talk/init_disp.c
+++ b/talk/init_disp.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/invite.c b/talk/invite.c
index 37d5304..30b8983 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/io.c b/talk/io.c
index 7502de0..64ef6e1 100644
--- a/talk/io.c
+++ b/talk/io.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/look_up.c b/talk/look_up.c
index 22ac311..d153352 100644
--- a/talk/look_up.c
+++ b/talk/look_up.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/msgs.c b/talk/msgs.c
index fac1fe9..980c066 100644
--- a/talk/msgs.c
+++ b/talk/msgs.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/talk.c b/talk/talk.c
index 7cead32..bc82f8a 100644
--- a/talk/talk.c
+++ b/talk/talk.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/talk.h b/talk/talk.h
index 8049f25..abc4c76 100644
--- a/talk/talk.h
+++ b/talk/talk.h
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/talk_ctl.h b/talk/talk_ctl.h
index d4894e9..3841324 100644
--- a/talk/talk_ctl.h
+++ b/talk/talk_ctl.h
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/Makefile.am b/talkd/Makefile.am
index e31fbb0..f6a4ae4 100644
--- a/talkd/Makefile.am
+++ b/talkd/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/talkd/acl.c b/talkd/acl.c
index 493541e..7b50a82 100644
--- a/talkd/acl.c
+++ b/talkd/acl.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/announce.c b/talkd/announce.c
index 3362969..d81cbeb 100644
--- a/talkd/announce.c
+++ b/talkd/announce.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
   Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/talkd/intalkd.h b/talkd/intalkd.h
index b611a33..aecb8e6 100644
--- a/talkd/intalkd.h
+++ b/talkd/intalkd.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010, 2011, 2012 Free Software Foundation, Inc.
+  2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/print.c b/talkd/print.c
index 6879915..9c16328 100644
--- a/talkd/print.c
+++ b/talkd/print.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/talkd/process.c b/talkd/process.c
index b2974b0..620de13 100644
--- a/talkd/process.c
+++ b/talkd/process.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/talkd/table.c b/talkd/table.c
index 24f6829..5df5afb 100644
--- a/talkd/table.c
+++ b/talkd/table.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/talkd/talkd.c b/talkd/talkd.c
index 2c43736..981ac83 100644
--- a/talkd/talkd.c
+++ b/talkd/talkd.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/telnet/Makefile.am b/telnet/Makefile.am
index b9e771b..02e6ae9 100644
--- a/telnet/Makefile.am
+++ b/telnet/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/telnet/authenc.c b/telnet/authenc.c
index e47304f..11dbb17 100644
--- a/telnet/authenc.c
+++ b/telnet/authenc.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/commands.c b/telnet/commands.c
index a586018..944516e 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/defines.h b/telnet/defines.h
index a24a010..f42e2f4 100644
--- a/telnet/defines.h
+++ b/telnet/defines.h
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/externs.h b/telnet/externs.h
index 4171a8e..c75ef51 100644
--- a/telnet/externs.h
+++ b/telnet/externs.h
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/general.h b/telnet/general.h
index dc2150b..1fec26d 100644
--- a/telnet/general.h
+++ b/telnet/general.h
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/krb4-proto.h b/telnet/krb4-proto.h
index 29b2fa4..2408778 100644
--- a/telnet/krb4-proto.h
+++ b/telnet/krb4-proto.h
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/main.c b/telnet/main.c
index 15b0c10..ed350fe 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/network.c b/telnet/network.c
index 3640ffb..e2fc5ea 100644
--- a/telnet/network.c
+++ b/telnet/network.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/ring.c b/telnet/ring.c
index 20178e4..f67e668 100644
--- a/telnet/ring.c
+++ b/telnet/ring.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/ring.h b/telnet/ring.h
index c22b300..df866e5 100644
--- a/telnet/ring.h
+++ b/telnet/ring.h
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index af21a90..a03d6b0 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/telnet.c b/telnet/telnet.c
index 8055fc7..694b8f8 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/terminal.c b/telnet/terminal.c
index b0e5a1e..8ef867e 100644
--- a/telnet/terminal.c
+++ b/telnet/terminal.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/tn3270.c b/telnet/tn3270.c
index 8488478..96e8b30 100644
--- a/telnet/tn3270.c
+++ b/telnet/tn3270.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/types.h b/telnet/types.h
index bc1dd79..4e429db 100644
--- a/telnet/types.h
+++ b/telnet/types.h
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/utilities.c b/telnet/utilities.c
index 5184eb5..1c29649 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
-  Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index 4c4ec90..8d08988 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/telnetd/pty.c b/telnetd/pty.c
index 53a3049..58bf4e2 100644
--- a/telnetd/pty.c
+++ b/telnetd/pty.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-  2011, 2012 Free Software Foundation, Inc.
+  2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/slc.c b/telnetd/slc.c
index c930931..7d4fcfc 100644
--- a/telnetd/slc.c
+++ b/telnetd/slc.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/state.c b/telnetd/state.c
index 6c8a59a..81dd9d7 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 3af45e6..ceca23c 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/telnetd.h b/telnetd/telnetd.h
index 6236722..45b17c0 100644
--- a/telnetd/telnetd.h
+++ b/telnetd/telnetd.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/telnetd/term.c b/telnetd/term.c
index 77d1177..e525a57 100644
--- a/telnetd/term.c
+++ b/telnetd/term.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-  2011, 2012 Free Software Foundation, Inc.
+  2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/termstat.c b/telnetd/termstat.c
index d9a72a2..c9ba24b 100644
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 729bd5f..5fb31b9 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free
-  Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+  2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1419a26..288acb8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
 # Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
diff --git a/tests/addrpeek.c b/tests/addrpeek.c
index dbac011..0992d23 100644
--- a/tests/addrpeek.c
+++ b/tests/addrpeek.c
@@ -1,5 +1,5 @@
 /* addrpeek - testing service for Inetd: remote address, environment vars
-  Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+  Copyright (C) 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/dnsdomainname.sh b/tests/dnsdomainname.sh
index e671302..0e8fdc7 100755
--- a/tests/dnsdomainname.sh
+++ b/tests/dnsdomainname.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 8c55283..55ff62d 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/hostname.sh b/tests/hostname.sh
index ffbbe2b..b42daf9 100755
--- a/tests/hostname.sh
+++ b/tests/hostname.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/ifconfig.sh b/tests/ifconfig.sh
index 8472e8e..6d438df 100755
--- a/tests/ifconfig.sh
+++ b/tests/ifconfig.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/localhost.c b/tests/localhost.c
index 19d5fb8..ec914b0 100644
--- a/tests/localhost.c
+++ b/tests/localhost.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+  Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/tests/ping-localhost.sh b/tests/ping-localhost.sh
index 8b092f8..0e66015 100755
--- a/tests/ping-localhost.sh
+++ b/tests/ping-localhost.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/readutmp.c b/tests/readutmp.c
index 59b788d..e9512cf 100644
--- a/tests/readutmp.c
+++ b/tests/readutmp.c
@@ -1,5 +1,5 @@
 /* readutmp - Basic test of existing utmp/utmpx access.
-  Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+  Copyright (C) 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 0614028..8fb5053 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/telnet-localhost.sh b/tests/telnet-localhost.sh
index 89ab47b..36293f1 100755
--- a/tests/telnet-localhost.sh
+++ b/tests/telnet-localhost.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/tftp.sh b/tests/tftp.sh
index 93a041d..fc31623 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/tools.sh.in b/tests/tools.sh.in
index 199c9d5..b63a55a 100644
--- a/tests/tools.sh.in
+++ b/tests/tools.sh.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/traceroute-localhost.sh b/tests/traceroute-localhost.sh
index ce22777..52c06aa 100755
--- a/tests/traceroute-localhost.sh
+++ b/tests/traceroute-localhost.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/utmp.sh b/tests/utmp.sh
index 556985c..79951cf 100755
--- a/tests/utmp.sh
+++ b/tests/utmp.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/waitdaemon.c b/tests/waitdaemon.c
index 1d66ee0..097e2ea 100644
--- a/tests/waitdaemon.c
+++ b/tests/waitdaemon.c
@@ -1,5 +1,5 @@
 /* waitdaemon -- Verify that waitdaemon() is functional.
-  Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+  Copyright (C) 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/whois/Makefile.am b/whois/Makefile.am
index f554a21..d69d5ba 100644
--- a/whois/Makefile.am
+++ b/whois/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/as_del_list b/whois/as_del_list
index 3311648..2ef191b 100644
--- a/whois/as_del_list
+++ b/whois/as_del_list
@@ -1,5 +1,5 @@
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/data.h b/whois/data.h
index 148e437..03e85fa 100644
--- a/whois/data.h
+++ b/whois/data.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/whois/ip_del_list b/whois/ip_del_list
index a93e530..10bb62e 100644
--- a/whois/ip_del_list
+++ b/whois/ip_del_list
@@ -1,5 +1,5 @@
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/make_as_del.pl b/whois/make_as_del.pl
index c0cedef..9b6c4d6 100755
--- a/whois/make_as_del.pl
+++ b/whois/make_as_del.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/make_ip_del.pl b/whois/make_ip_del.pl
index 6bfb925..2ef7ccf 100755
--- a/whois/make_ip_del.pl
+++ b/whois/make_ip_del.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/make_tld_serv.pl b/whois/make_tld_serv.pl
index d86f820..4b7d006 100755
--- a/whois/make_tld_serv.pl
+++ b/whois/make_tld_serv.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/tld_serv_list b/whois/tld_serv_list
index 527c3b4..19333ba 100644
--- a/whois/tld_serv_list
+++ b/whois/tld_serv_list
@@ -1,5 +1,5 @@
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/whois.c b/whois/whois.c
index 5af351b..7f7c5f5 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/whois/whois.h b/whois/whois.h
index 76e07ca..84f3104 100644
--- a/whois/whois.h
+++ b/whois/whois.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+  2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                     |    2 +-
 ChangeLog.0                   |    4 ++--
 Makefile.am                   |    4 ++--
 NEWS                          |    4 ++--
 README                        |    3 ++-
 README-alpha                  |    2 +-
 THANKS                        |    3 ++-
 bootstrap.conf                |    2 +-
 cfg.mk                        |    2 +-
 configure.ac                  |    2 +-
 doc/Makefile.am               |    2 +-
 doc/inetutils.texi            |    3 ++-
 ftp/Makefile.am               |    4 ++--
 ftp/cmds.c                    |    4 ++--
 ftp/cmdtab.c                  |    4 ++--
 ftp/domacro.c                 |    4 ++--
 ftp/extern.h                  |    4 ++--
 ftp/ftp.c                     |    4 ++--
 ftp/ftp_var.h                 |    4 ++--
 ftp/main.c                    |    4 ++--
 ftp/ruserpass.c               |    4 ++--
 ftpd/Makefile.am              |    4 ++--
 ftpd/auth.c                   |    2 +-
 ftpd/conf.c                   |    2 +-
 ftpd/extern.h                 |    4 ++--
 ftpd/ftpcmd.y                 |    4 ++--
 ftpd/ftpd.c                   |    4 ++--
 ftpd/logwtmp.c                |    2 +-
 ftpd/pam.c                    |    2 +-
 ftpd/popen.c                  |    4 ++--
 ftpd/server_mode.c            |    2 +-
 ifconfig/Makefile.am          |    2 +-
 ifconfig/changeif.c           |    2 +-
 ifconfig/flags.c              |    2 +-
 ifconfig/flags.h              |    2 +-
 ifconfig/ifconfig.c           |    2 +-
 ifconfig/ifconfig.h           |    2 +-
 ifconfig/options.c            |    2 +-
 ifconfig/options.h            |    2 +-
 ifconfig/printif.c            |    2 +-
 ifconfig/printif.h            |    2 +-
 ifconfig/system.c             |    2 +-
 ifconfig/system.h             |    2 +-
 ifconfig/system/Makefile.am   |    2 +-
 ifconfig/system/bsd.c         |    2 +-
 ifconfig/system/bsd.h         |    2 +-
 ifconfig/system/generic.c     |    2 +-
 ifconfig/system/generic.h     |    2 +-
 ifconfig/system/linux.c       |    2 +-
 ifconfig/system/linux.h       |    2 +-
 ifconfig/system/qnx.c         |    2 +-
 ifconfig/system/qnx.h         |    2 +-
 ifconfig/system/solaris.c     |    2 +-
 ifconfig/system/solaris.h     |    2 +-
 libicmp/Makefile.am           |    2 +-
 libicmp/icmp.h                |    2 +-
 libicmp/icmp_address.c        |    2 +-
 libicmp/icmp_cksum.c          |    2 +-
 libicmp/icmp_echo.c           |    2 +-
 libicmp/icmp_timestamp.c      |    2 +-
 libinetutils/Makefile.am      |    4 ++--
 libinetutils/argcv.c          |    2 +-
 libinetutils/argcv.h          |    2 +-
 libinetutils/cleansess.c      |    2 +-
 libinetutils/daemon.c         |    2 +-
 libinetutils/defauthors.c     |    2 +-
 libinetutils/des_rw.c         |    4 ++--
 libinetutils/if_index.c       |    2 +-
 libinetutils/kcmd.c           |    4 ++--
 libinetutils/krcmd.c          |    4 ++--
 libinetutils/libinetutils.h   |    4 ++--
 libinetutils/localhost.c      |    2 +-
 libinetutils/logwtmp.c        |    2 +-
 libinetutils/logwtmpko.c      |    4 ++--
 libinetutils/setsig.c         |    4 ++--
 libinetutils/shishi.c         |    4 ++--
 libinetutils/shishi_def.h     |    4 ++--
 libinetutils/tftpsubs.c       |    2 +-
 libinetutils/tftpsubs.h       |    2 +-
 libinetutils/ttymsg.c         |    2 +-
 libinetutils/utmp_init.c      |    2 +-
 libinetutils/utmp_logout.c    |    2 +-
 libls/Makefile.am             |    2 +-
 libls/cmp.c                   |    2 +-
 libls/extern.h                |    2 +-
 libls/fts.c                   |    2 +-
 libls/fts.h                   |    2 +-
 libls/ls.c                    |    2 +-
 libls/ls.h                    |    2 +-
 libls/print.c                 |    2 +-
 libls/stat_flags.c            |    2 +-
 libls/util.c                  |    2 +-
 libtelnet/Makefile.am         |    4 ++--
 libtelnet/auth-proto.h        |    2 +-
 libtelnet/auth.c              |    4 ++--
 libtelnet/auth.h              |    2 +-
 libtelnet/enc-proto.h         |    2 +-
 libtelnet/enc_des.c           |    4 ++--
 libtelnet/encrypt.c           |    4 ++--
 libtelnet/encrypt.h           |    2 +-
 libtelnet/forward.c           |    4 ++--
 libtelnet/genget.c            |    4 ++--
 libtelnet/genget.h            |    2 +-
 libtelnet/getent.c            |    4 ++--
 libtelnet/kerberos.c          |    4 ++--
 libtelnet/kerberos5.c         |    4 ++--
 libtelnet/key-proto.h         |    2 +-
 libtelnet/misc-proto.h        |    2 +-
 libtelnet/misc.c              |    2 +-
 libtelnet/misc.h              |    2 +-
 libtelnet/read_passwd.c       |    4 ++--
 libtelnet/shishi.c            |    2 +-
 man/Makefile.am               |    3 ++-
 paths                         |    2 +-
 ping/Makefile.am              |    4 ++--
 ping/libping.c                |    4 ++--
 ping/ping.c                   |    2 +-
 ping/ping.h                   |    4 ++--
 ping/ping6.c                  |    4 ++--
 ping/ping6.h                  |    4 ++--
 ping/ping_address.c           |    2 +-
 ping/ping_common.c            |    4 ++--
 ping/ping_common.h            |    4 ++--
 ping/ping_echo.c              |    2 +-
 ping/ping_impl.h              |    2 +-
 ping/ping_router.c            |    2 +-
 ping/ping_timestamp.c         |    2 +-
 src/Makefile.am               |    4 ++--
 src/dnsdomainname.c           |    2 +-
 src/hostname.c                |    4 ++--
 src/inetd.c                   |    2 +-
 src/logger.c                  |    3 ++-
 src/logprio.h                 |    2 +-
 src/rcp.c                     |    4 ++--
 src/rexec.c                   |    3 ++-
 src/rexecd.c                  |    4 ++--
 src/rlogin.c                  |    4 ++--
 src/rlogind.c                 |    4 ++--
 src/rsh.c                     |    4 ++--
 src/rshd.c                    |    2 +-
 src/syslogd.c                 |    4 ++--
 src/tftp.c                    |    4 ++--
 src/tftpd.c                   |    4 ++--
 src/traceroute.c              |    2 +-
 src/uucpd.c                   |    4 ++--
 talk/Makefile.am              |    4 ++--
 talk/ctl.c                    |    4 ++--
 talk/ctl_transact.c           |    4 ++--
 talk/display.c                |    4 ++--
 talk/get_addrs.c              |    4 ++--
 talk/get_names.c              |    4 ++--
 talk/init_disp.c              |    4 ++--
 talk/invite.c                 |    4 ++--
 talk/io.c                     |    4 ++--
 talk/look_up.c                |    4 ++--
 talk/msgs.c                   |    4 ++--
 talk/talk.c                   |    4 ++--
 talk/talk.h                   |    4 ++--
 talk/talk_ctl.h               |    4 ++--
 talkd/Makefile.am             |    4 ++--
 talkd/acl.c                   |    2 +-
 talkd/announce.c              |    2 +-
 talkd/intalkd.h               |    2 +-
 talkd/print.c                 |    2 +-
 talkd/process.c               |    2 +-
 talkd/table.c                 |    2 +-
 talkd/talkd.c                 |    2 +-
 telnet/Makefile.am            |    4 ++--
 telnet/authenc.c              |    4 ++--
 telnet/commands.c             |    4 ++--
 telnet/defines.h              |    4 ++--
 telnet/externs.h              |    4 ++--
 telnet/general.h              |    4 ++--
 telnet/krb4-proto.h           |    4 ++--
 telnet/main.c                 |    4 ++--
 telnet/network.c              |    4 ++--
 telnet/ring.c                 |    4 ++--
 telnet/ring.h                 |    4 ++--
 telnet/sys_bsd.c              |    4 ++--
 telnet/telnet.c               |    4 ++--
 telnet/terminal.c             |    4 ++--
 telnet/tn3270.c               |    4 ++--
 telnet/types.h                |    4 ++--
 telnet/utilities.c            |    4 ++--
 telnetd/Makefile.am           |    4 ++--
 telnetd/pty.c                 |    2 +-
 telnetd/slc.c                 |    4 ++--
 telnetd/state.c               |    4 ++--
 telnetd/telnetd.c             |    4 ++--
 telnetd/telnetd.h             |    2 +-
 telnetd/term.c                |    2 +-
 telnetd/termstat.c            |    4 ++--
 telnetd/utility.c             |    4 ++--
 tests/Makefile.am             |    2 +-
 tests/addrpeek.c              |    2 +-
 tests/dnsdomainname.sh        |    2 +-
 tests/ftp-localhost.sh        |    2 +-
 tests/hostname.sh             |    2 +-
 tests/ifconfig.sh             |    2 +-
 tests/localhost.c             |    2 +-
 tests/ping-localhost.sh       |    3 ++-
 tests/readutmp.c              |    2 +-
 tests/syslogd.sh              |    2 +-
 tests/telnet-localhost.sh     |    2 +-
 tests/tftp.sh                 |    2 +-
 tests/tools.sh.in             |    2 +-
 tests/traceroute-localhost.sh |    3 ++-
 tests/utmp.sh                 |    2 +-
 tests/waitdaemon.c            |    2 +-
 whois/Makefile.am             |    2 +-
 whois/as_del_list             |    2 +-
 whois/data.h                  |    2 +-
 whois/ip_del_list             |    2 +-
 whois/make_as_del.pl          |    2 +-
 whois/make_ip_del.pl          |    2 +-
 whois/make_tld_serv.pl        |    2 +-
 whois/tld_serv_list           |    2 +-
 whois/whois.c                 |    2 +-
 whois/whois.h                 |    2 +-
 219 files changed, 319 insertions(+), 311 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed May 29 11:15:01 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uhi5d-0004nB-1U
	for mharc-commit-inetutils@gnu.org; Wed, 29 May 2013 11:15:01 -0400
Received: from eggs.gnu.org ([208.118.235.92]:36613)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uhi5W-0004mS-U5
	for commit-inetutils@gnu.org; Wed, 29 May 2013 11:15:00 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uhi5Q-0002zd-U0
	for commit-inetutils@gnu.org; Wed, 29 May 2013 11:14:54 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:47465)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uhi5Q-0002zV-Ns
	for commit-inetutils@gnu.org; Wed, 29 May 2013 11:14:48 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1Uhi5P-0005ld-OO
	for commit-inetutils@gnu.org; Wed, 29 May 2013 15:14:48 +0000
Date: Wed, 29 May 2013 15:14:47 +0000
Message-Id: <E1Uhi5P-0005ld-OO@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-298-gae30a11
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d1d52cce92dd289b800ec922d77b0b4cd4c83fdc
X-Git-Newrev: ae30a115919812538838839f6cb2ecdf59017c3e
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 May 2013 15:15:00 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  ae30a115919812538838839f6cb2ecdf59017c3e (commit)
      from  d1d52cce92dd289b800ec922d77b0b4cd4c83fdc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=ae30a115919812538838839f6cb2ecdf59017c3e


commit ae30a115919812538838839f6cb2ecdf59017c3e
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon May 27 23:51:28 2013 +0200

    rshd: Locked or expired accounts.

diff --git a/ChangeLog b/ChangeLog
index 2f4bac5..125b6aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-05-27  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	rshd: Check account locking and expiration.
+
+	* src/rshd.c [HAVE_SHADOW_H]: Include <shadow.h>.
+	(DAY) [!DAY]: New macro.
+	(doit): Multiple, minor changes to error strings.
+	[!WITH_PAM]: New checks of account being either
+	locked, or expired.  The code tests HAVE_GETSPNAM
+	and HAVE_STRUCT_PASSWD_PW_EXPIRE for system quirks.
+
 2013-05-22  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	libinetutils: Clarify Kerberos dependency.
diff --git a/src/rshd.c b/src/rshd.c
index cfad200..3cf6f22 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -129,6 +129,9 @@
 # include <sys/filio.h>
 #endif
 #include <pwd.h>
+#ifdef HAVE_SHADOW_H
+# include <shadow.h>
+#endif
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -175,6 +178,10 @@
 # define MAX(a,b) (((a) > (b)) ? (a) : (b))
 #endif
 
+#ifndef DAY
+# define DAY (24 * 60 * 60)
+#endif
+
 int keepalive = 1;		/* flag for SO_KEEPALIVE scoket option */
 int check_all;
 int log_success;		/* If TRUE, log all successful accesses */
@@ -718,9 +725,9 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 	    rc = getaddrinfo (hostname, NULL, &hints, &res);
 	    if (rc != 0)
 	      {
-		syslog (LOG_INFO, "Could not resolve address for %s",
+		syslog (LOG_INFO, "Could not resolve address for %s.",
 			hostname);
-		errorstr = "Could not resolve address for your host (%s)\n";
+		errorstr = "Could not resolve address for your host (%s).\n";
 		hostname = addrstr;
 	      }
 	    else
@@ -743,9 +750,9 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 		if (ai == NULL)
 		  {
 		    syslog (LOG_NOTICE,
-			    "Host addr %s not listed for host %s",
+			    "Host addr %s not listed for host %s.",
 			    addrstr, hostname);
-		    errorstr = "Host address mismatch for %s\n";
+		    errorstr = "Host address mismatch for %s.\n";
 		    hostname = addrstr;
 		  }
 	      }
@@ -779,7 +786,7 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 	  {
 	    char *remotehost = alloca (strlen (hostname) + 1);
 	    if (!remotehost)
-	      errorstr = "Out of memory\n";
+	      errorstr = "Out of memory.\n";
 	    else
 	      {
 		strcpy (remotehost, hostname);
@@ -788,9 +795,9 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 		if (hp == NULL)
 		  {
 		    syslog (LOG_INFO,
-			    "Couldn't look up address for %s", remotehost);
+			    "Couldn't look up address for %s.", remotehost);
 		    errorstr =
-		      "Couldn't look up address for your host (%s)\n";
+		      "Couldn't look up address for your host (%s).\n";
 		    hostname = addrstr;
 		  }
 		else
@@ -799,9 +806,9 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 		      if (hp->h_addr_list[0] == NULL)
 			{
 			  syslog (LOG_NOTICE,
-				  "Host addr %s not listed for host %s",
+				  "Host addr %s not listed for host %s.",
 				  addrstr, hp->h_name);
-			  errorstr = "Host address mismatch for %s\n";
+			  errorstr = "Host address mismatch for %s.\n";
 			  hostname = addrstr;
 			  break;
 			}
@@ -1186,6 +1193,8 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
       goto fail;
     }
 
+  /* Checks existence of account, and more.
+   */
   pam_rc = pam_authenticate (pam_handle, PAM_SILENT);
   if (pam_rc != PAM_SUCCESS)
     {
@@ -1208,6 +1217,8 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 	}
     }
 
+  /* Checks expiration of account, and more.
+   */
   pam_rc = pam_acct_mgmt (pam_handle, PAM_SILENT);
   if (pam_rc != PAM_SUCCESS)
     {
@@ -1229,7 +1240,7 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
 	case PAM_PERM_DENIED:
 	case PAM_USER_UNKNOWN:
 	default:
-	  errorstr = "Permission denied.";
+	  errorstr = "Permission denied.\n";
 	  goto fail;
 	  break;
 	}
@@ -1260,19 +1271,115 @@ doit (int sockfd, struct sockaddr *fromp, socklen_t fromlen)
       errorstr = "Login incorrect.\n";
       goto fail;
     }
-#endif /* WITH_PAM */
+#else /* !WITH_PAM */
+  /*
+   * The account exists by a previous call to getpwnam().
+   * Is the account locked, or has it expired?
+   */
+  {
+    time_t now;
+
+# ifdef HAVE_GETSPNAM
+    struct spwd *spwd;
+
+    /*
+     * GNU/Linux, Solaris
+     *
+     * Locked account?
+     */
+    spwd = getspnam (pwd->pw_name);
+    if (!spwd)
+      {
+	syslog (LOG_ERR | LOG_AUTH, "No access to encrypted password.");
+	if (errorstr == NULL)
+	  errorstr = "Login incorrect.\n";
+	goto fail;
+      }
+    else
+      {
+	/* Locked accounts have their passwords prefixed with a blocker.  */
+	if (!strncmp ("!", spwd->sp_pwdp, strlen ("!"))
+	    || !strncmp ("*LK*", spwd->sp_pwdp, strlen ("*OK*")))
+	  {
+	    syslog (LOG_INFO | LOG_AUTH,
+		    "%s@%s as %s: account is locked. cmd='%.80s'",
+		    remuser, hostname, locuser, cmdbuf);
+	    if (errorstr == NULL)
+	      errorstr = "Permission denied.\n";
+	    goto fail;
+	  }
+      }
 
-#if defined WITH_IRUSEROK_AF && !defined WITH_PAM
-    switch (fromp->sa_family)
+    /*
+     * Expired account?
+     */
+    time (&now);
+    if (spwd->sp_expire > 0)
       {
-      case AF_INET6:
-	fromaddrp = (void *) &((struct sockaddr_in6 *) fromp)->sin6_addr;
-	break;
-      case AF_INET:
-      default:
-	fromaddrp = (void *) &((struct sockaddr_in *) fromp)->sin_addr;
+	time_t end_acct = DAY * spwd->sp_expire;
+
+	if (difftime (now, end_acct) > 0)
+	  {
+	    syslog (LOG_INFO | LOG_AUTH,
+		    "%s@%s as %s: account is expired. cmd='%.80s'",
+		    remuser, hostname, locuser, cmdbuf);
+	    if (errorstr == NULL)
+	      errorstr = "Permission denied.\n";
+	    goto fail;
+	  }
       }
-#endif
+# else /* !HAVE_GETSPNAM */
+    /*
+     * BSD systems.
+     *
+     * Locked account?
+     */
+    if (!strncmp ("*LOCKED*", pwd->pw_passwd, strlen ("*LOCKED*")))
+      {
+	syslog (LOG_INFO | LOG_AUTH,
+		"%s@%s as %s: account is locked. cmd='%.80s'",
+		remuser, hostname, locuser, cmdbuf);
+	if (errorstr == NULL)
+	  errorstr = "Permission denied.\n";
+	goto fail;
+      }
+
+    /*
+     * Expired account?
+     */
+#  ifdef HAVE_STRUCT_PASSWD_PW_EXPIRE
+    time (&now);
+
+    /*
+     * Negative `pw_expire' indicates on NetBSD
+     * an immediate need for change of password.
+     */
+    if (((pwd->pw_expire > 0) && (difftime (now, pwd->pw_expire) > 0))
+	|| (pwd->pw_expire < 0))
+      {
+	syslog (LOG_INFO | LOG_AUTH,
+		"%s@%s as %s: account is expired. cmd='%.80s'",
+		remuser, hostname, locuser, cmdbuf);
+	if (errorstr == NULL)
+	  errorstr = "Permission denied.\n";
+	goto fail;
+      }
+#  endif /* HAVE_STRUCT_PASSWD_PW_EXPIRE */
+# endif /* !HAVE_GETSPNAM */
+  }
+
+#if defined WITH_IRUSEROK_AF
+  switch (fromp->sa_family)
+    {
+    case AF_INET6:
+      fromaddrp = (void *) &((struct sockaddr_in6 *) fromp)->sin6_addr;
+      break;
+    case AF_INET:
+    default:
+      fromaddrp = (void *) &((struct sockaddr_in *) fromp)->sin_addr;
+    }
+# endif /* !WITH_IRUSEROK_AF */
+#endif /* !WITH_PAM */
 
 #ifdef KRB4
   if (use_kerberos)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog  |   11 +++++
 src/rshd.c |  147 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 138 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed May 29 16:50:17 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UhnK5-0008O2-BZ
	for mharc-commit-inetutils@gnu.org; Wed, 29 May 2013 16:50:17 -0400
Received: from eggs.gnu.org ([208.118.235.92]:56540)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UhnJy-0008Mi-O7
	for commit-inetutils@gnu.org; Wed, 29 May 2013 16:50:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UhnJs-0005C3-VG
	for commit-inetutils@gnu.org; Wed, 29 May 2013 16:50:10 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:59614)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UhnJs-00059b-Rn
	for commit-inetutils@gnu.org; Wed, 29 May 2013 16:50:04 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1UhnJr-0006kX-Bq
	for commit-inetutils@gnu.org; Wed, 29 May 2013 20:50:03 +0000
Date: Wed, 29 May 2013 20:50:03 +0000
Message-Id: <E1UhnJr-0006kX-Bq@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-299-ga3508ed
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ae30a115919812538838839f6cb2ecdf59017c3e
X-Git-Newrev: a3508ed9308e61b5998af03b40183725d66fe9b1
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 29 May 2013 20:50:16 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  a3508ed9308e61b5998af03b40183725d66fe9b1 (commit)
      from  ae30a115919812538838839f6cb2ecdf59017c3e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=a3508ed9308e61b5998af03b40183725d66fe9b1


commit a3508ed9308e61b5998af03b40183725d66fe9b1
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed May 29 19:49:52 2013 +0200

    syslogd: Refactor configuration loading.
    
    Based on a patch suggested by Guillem Jover.
    Added a change to legacy code on linked lists.

diff --git a/ChangeLog b/ChangeLog
index 125b6aa..0d83bea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2013-05-29  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	syslogd: Refactor loading of configuration file.
+	Code outlined by Guillem Jover <guillem@hadrons.org>
+	<http://lists.gnu.org/archive/html/bug-inetutils/2009-12/msg00053.html>.
+	Added an important correction to the legacy code
+	for building linked lists of logging files.
+
+	* src/syslogd.c (load_conffile): New function.
+	First build a new structure `struct filed' from
+	input line, then incorporate it into `*nextp'.
+	(init): Refactor code for loading a configuration
+	file, moving it to load_conffile().
+	New variable RC.  Remove CF, P, LINE_MAX, CBUF,
+	CLINE, and CONT_LINE.
+	Register an additional error message, should loading
+	have been incomplete.
+
 2013-05-27  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	rshd: Check account locking and expiration.
diff --git a/src/syslogd.c b/src/syslogd.c
index bbdca48..18a3e41 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -258,6 +258,7 @@ void doexit (int);
 void domark (int);
 void find_inet_port (const char *);
 void fprintlog (struct filed *, const char *, int, const char *);
+static int load_conffile (const char *, struct filed **);
 void init (int);
 void logerror (const char *);
 void logmsg (int, const char *, const char *, int);
@@ -1796,12 +1797,11 @@ die (int signo)
   exit (EXIT_SUCCESS);
 }
 
-/* INIT -- Initialize syslogd from configuration table.  */
-void
-init (int signo _GL_UNUSED_PARAMETER)
+static int
+load_conffile (const char *filename, struct filed **nextp)
 {
   FILE *cf;
-  struct filed *f, *next, **nextp;
+  struct filed *f;
   char *p;
 #ifndef LINE_MAX
 # define LINE_MAX 2048
@@ -1811,64 +1811,32 @@ init (int signo _GL_UNUSED_PARAMETER)
   char *cline;
   int cont_line = 0;
 
-  dbg_printf ("init\n");
+  /* Beware: Do not assume *nextp to be NULL.  */
 
-  /* Close all open log files.  */
-  Initialized = 0;
-  for (f = Files; f != NULL; f = next)
+  /* Open the configuration file.  */
+  cf = fopen (filename, "r");
+  if (cf == NULL)
     {
-      int j;
+      dbg_printf ("cannot open %s\n", filename);
 
-      /* Flush any pending output.  */
-      if (f->f_prevcount)
-	fprintlog (f, LocalHostName, 0, (char *) NULL);
-
-      switch (f->f_type)
+      /* Add emergency logging if everything else was missing.  */
+      if (*nextp == NULL)
 	{
-	case F_FILE:
-	case F_TTY:
-	case F_CONSOLE:
-	case F_PIPE:
-	  free (f->f_un.f_fname);
-	  close (f->f_file);
-	  break;
-	case F_FORW:
-	case F_FORW_SUSP:
-	case F_FORW_UNKN:
-	  free (f->f_un.f_forw.f_hname);
-	  break;
-	case F_USERS:
-	  for (j = 0; j < f->f_un.f_user.f_nusers; ++j)
-	    free (f->f_un.f_user.f_unames[j]);
-	  free (f->f_un.f_user.f_unames);
-	  break;
-	}
-      free (f->f_progname);
-      free (f->f_prevhost);
-      next = f->f_next;
-      free (f);
-    }
-  Files = NULL;
-  nextp = &Files;
+	  /* Send LOG_ERR to the system console.  */
+	  f = (struct filed *) calloc (1, sizeof (*f));
+	  cfline ("*.ERR\t" PATH_CONSOLE, f);		/* Erases *f!  */
 
-  facilities_seen = 0;
+	  /* Below that, send LOG_EMERG to all users.  */
+	  f->f_next = (struct filed *) calloc (1, sizeof (*f));
+	  cfline ("*.PANIC\t*", f->f_next);	/* Erases *(f->f_next)!  */
+
+	  *nextp = f;	/* Return this minimal table to the caller.  */
+	}
 
-  /* Open the configuration file.  */
-  cf = fopen (ConfFile, "r");
-  if (cf == NULL)
-    {
-      dbg_printf ("cannot open %s\n", ConfFile);
-      *nextp = (struct filed *) calloc (1, sizeof (*f));
-      cfline ("*.ERR\t" PATH_CONSOLE, *nextp);
-      (*nextp)->f_next = (struct filed *) calloc (1, sizeof (*f));
-      cfline ("*.PANIC\t*", (*nextp)->f_next);
       Initialized = 1;
-      return;
+      return 1;
     }
 
-  /* Foreach line in the conf table, open that file.  */
-  f = NULL;
-
   /* Allocate a buffer for line parsing.  */
   cbuf = malloc (line_max);
   if (cbuf == NULL)
@@ -1876,7 +1844,7 @@ init (int signo _GL_UNUSED_PARAMETER)
       /* There is no graceful recovery here.  */
       dbg_printf ("cannot allocate space for configuration\n");
       fclose (cf);
-      return;
+      return 0;
     }
   cline = cbuf;
 
@@ -1921,7 +1889,7 @@ init (int signo _GL_UNUSED_PARAMETER)
 	      dbg_printf ("cannot allocate space configuration\n");
 	      fclose (cf);
 	      free (cbuf);
-	      return;
+	      return 0;
 	    }
 	  else
 	    cbuf = tmp;
@@ -2003,17 +1971,75 @@ init (int signo _GL_UNUSED_PARAMETER)
 
       *++p = '\0';
 
-      /* Send the line for more parsing.  */
+      /* Send the line for more parsing.
+       * Then generate the new entry,
+       * inserting it at the head of
+       * the already existing table.
+       */
       f = (struct filed *) calloc (1, sizeof (*f));
+      cfline (cbuf, f);			/* Erases *f!  */
+      f->f_next = *nextp;
       *nextp = f;
-      nextp = &f->f_next;
-      cfline (cbuf, f);
     }
 
   /* Close the configuration file.  */
   fclose (cf);
   free (cbuf);
 
+  return 1;
+}
+
+/* INIT -- Initialize syslogd from configuration table.  */
+void
+init (int signo _GL_UNUSED_PARAMETER)
+{
+  int rc;
+  struct filed *f, *next, **nextp;
+
+  dbg_printf ("init\n");
+
+  /* Close all open log files.  */
+  Initialized = 0;
+  for (f = Files; f != NULL; f = next)
+    {
+      int j;
+
+      /* Flush any pending output.  */
+      if (f->f_prevcount)
+	fprintlog (f, LocalHostName, 0, (char *) NULL);
+
+      switch (f->f_type)
+	{
+	case F_FILE:
+	case F_TTY:
+	case F_CONSOLE:
+	case F_PIPE:
+	  free (f->f_un.f_fname);
+	  close (f->f_file);
+	  break;
+	case F_FORW:
+	case F_FORW_SUSP:
+	case F_FORW_UNKN:
+	  free (f->f_un.f_forw.f_hname);
+	  break;
+	case F_USERS:
+	  for (j = 0; j < f->f_un.f_user.f_nusers; ++j)
+	    free (f->f_un.f_user.f_unames[j]);
+	  free (f->f_un.f_user.f_unames);
+	  break;
+	}
+      free (f->f_progname);
+      free (f->f_prevhost);
+      next = f->f_next;
+      free (f);
+    }
+
+  Files = NULL;		/* Empty the table.  */
+  nextp = &Files;
+  facilities_seen = 0;
+
+  rc = load_conffile (ConfFile, nextp);
+
   Initialized = 1;
 
   if (Debug)
@@ -2058,6 +2084,11 @@ init (int signo _GL_UNUSED_PARAMETER)
   else
     logmsg (LOG_SYSLOG | LOG_INFO, "syslogd (" PACKAGE_NAME
 	    " " PACKAGE_VERSION "): restart", LocalHostName, ADDDATE);
+
+  if (!rc)
+    logmsg (LOG_SYSLOG | LOG_ERR, "syslogd: Incomplete configuration.",
+	    LocalHostName, ADDDATE);
+
   dbg_printf ("syslogd: restarted\n");
 }
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog     |   18 +++++++
 src/syslogd.c |  147 ++++++++++++++++++++++++++++++++++----------------------
 2 files changed, 107 insertions(+), 58 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed May 29 20:05:05 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UhqMb-0000Um-Iq
	for mharc-commit-inetutils@gnu.org; Wed, 29 May 2013 20:05:05 -0400
Received: from eggs.gnu.org ([208.118.235.92]:39351)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UhqMU-0000T2-Cj
	for commit-inetutils@gnu.org; Wed, 29 May 2013 20:05:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UhqMO-0005y7-G9
	for commit-inetutils@gnu.org; Wed, 29 May 2013 20:04:58 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:56020)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UhqMO-0005y3-CV
	for commit-inetutils@gnu.org; Wed, 29 May 2013 20:04:52 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1UhqMN-00006I-Qh
	for commit-inetutils@gnu.org; Thu, 30 May 2013 00:04:52 +0000
Date: Thu, 30 May 2013 00:04:51 +0000
Message-Id: <E1UhqMN-00006I-Qh@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-301-g8c5a700
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a3508ed9308e61b5998af03b40183725d66fe9b1
X-Git-Newrev: 8c5a7001976fad8e0786691f8ccf45467fbf414e
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 30 May 2013 00:05:04 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  8c5a7001976fad8e0786691f8ccf45467fbf414e (commit)
       via  d6dbed51be6650c560c2872711991090fbff3d0b (commit)
      from  a3508ed9308e61b5998af03b40183725d66fe9b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=8c5a7001976fad8e0786691f8ccf45467fbf414e


commit 8c5a7001976fad8e0786691f8ccf45467fbf414e
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed May 29 22:11:05 2013 +0200

    tests: Directory loading in syslogd.

diff --git a/ChangeLog b/ChangeLog
index 51f661b..56c6266 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2013-05-29  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	tests: Directory loading in syslogd.
+
+	* tests/syslogd.sh (CONFD): New variable.
+	(IU_OPTIONS): Add directory setting `--rcdir'.
+	<reloaded configuration>: Move directive for
+	severity `debug' to a file in $CONFD.
+
+	* src/syslogd.c (main) <NoDetach>: Mention the
+	process ID when telling about debug signal USR1.
+
+2013-05-29  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	syslogd: Load configuration from directory.
 	Code suggested by Guillem Jover <guillem@hadrons.org>
 	<http://lists.gnu.org/archive/html/bug-inetutils/2009-12/msg00054.html>.
diff --git a/NEWS b/NEWS
index fd76abb..ffa031e 100644
--- a/NEWS
+++ b/NEWS
@@ -60,6 +60,9 @@ Messages can be logged to specific files according to the name
 of the submitting program, on the tag attached to the message.
 The mechanism is patterned on an established BSD feature.
 
+Support loading of multiple configuration files located in a
+single directory.  New switches `-D/--rcdir'.
+
 * telnet
 
 New switch `-k/--realm'.
diff --git a/src/syslogd.c b/src/syslogd.c
index 46e5109..75a5083 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -681,7 +681,8 @@ main (int argc, char *argv[])
   if (NoDetach)
     {
       dbg_output = 1;
-      dbg_printf ("Debugging disabled, send SIGUSR1 to turn on debugging.\n");
+      dbg_printf ("Debugging is disabled. Send SIGUSR1 to PID=%d "
+		  "to turn on debugging.\n", (int) getpid ());
       dbg_output = 0;
     }
 
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 8fb5053..93ad0a1 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -139,13 +139,16 @@ elif expr X"$IU_TESTDIR" : X"\.\{1,2\}/\{0,1\}$" >/dev/null; then
     exit 77
 fi
 
-# The SYSLOG daemon uses four files.
+# The SYSLOG daemon uses four files and one directory.
 #
 CONF="$IU_TESTDIR"/syslog.conf
+CONFD="$IU_TESTDIR"/syslog.d
 PID="$IU_TESTDIR"/syslogd.pid
 OUT="$IU_TESTDIR"/messages
 : ${SOCKET:=$IU_TESTDIR/log}
 
+mkdir -p "$CONFD"
+
 # Are we able to write in IU_TESTDIR?
 # This could happen with preset IU_TESTDIR.
 #
@@ -345,7 +348,7 @@ fi
 # building the desired option list.
 #
 ## Base configuration.
-IU_OPTIONS="--rcfile='$CONF' --pidfile='$PID'"
+IU_OPTIONS="--rcfile='$CONF' --rcdir='$CONFD' --pidfile='$PID'"
 if $do_unix_socket; then
     IU_OPTIONS="$IU_OPTIONS --socket='$SOCKET'"
 else
@@ -440,6 +443,9 @@ OUT_DEBUG="$IU_TESTDIR"/debug.log
 cat > "$CONF" <<-EOT
 	*.*		$OUT
 	user.info	$OUT_USER
+EOT
+
+cat > "$CONFD/debug" <<-EOT
 	*.=debug	$OUT_DEBUG
 EOT
 

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=d6dbed51be6650c560c2872711991090fbff3d0b


commit d6dbed51be6650c560c2872711991090fbff3d0b
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed May 29 21:56:10 2013 +0200

    syslogd: Load configuration from directory.
    
    Based on a patch suggested by Guillem Jover.

diff --git a/ChangeLog b/ChangeLog
index 0d83bea..51f661b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2013-05-29  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	syslogd: Load configuration from directory.
+	Code suggested by Guillem Jover <guillem@hadrons.org>
+	<http://lists.gnu.org/archive/html/bug-inetutils/2009-12/msg00054.html>.
+	Minor changes with failure tracking.
+
+	* paths (PATH_LOGCONFD): New variable.
+	* src/Makefile.am (AM_CPPFLAGS): Add $(PATHDEF_LOGCONFD).
+	* src/syslogd.c: Include <dirent.h>.
+	(ConfDir): New variable.
+	(argp_options): New option `-D/--rcdir'.
+	(parse_opt) <'D'>: New case.
+	(load_confdir): New function.
+	(init): New variable RET.  Call load_confdir(),
+	making sure that failures are reported.
+
+2013-05-29  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	syslogd: Refactor loading of configuration file.
 	Code outlined by Guillem Jover <guillem@hadrons.org>
 	<http://lists.gnu.org/archive/html/bug-inetutils/2009-12/msg00053.html>.
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index a39e400..13bdbee 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -3274,6 +3274,12 @@ syslogd [@var{options}]@dots{}
 @opindex --rcfile
 Override configuration (the default file is @file{/etc/syslog.conf}).
 
+@item -D @var{dir}
+@itemx --rcdir=@var{dir}
+@opindex -D
+@opindex --rcdir
+Override configuration directory (the default is @file{/etc/syslog.d}).
+
 @item --pidfile=@var{file}
 @opindex --pidfile
 Override pidfile (the default file is @file{/var/run/syslogd.pid}).
diff --git a/paths b/paths
index 8808b49..70c0f57 100644
--- a/paths
+++ b/paths
@@ -91,6 +91,7 @@ PATH_LASTLOG	<utmp.h> $(localstatedir)/log/lastlog search:lastlog:/var/log:/var/
 PATH_LOG	<syslog.h> /dev/log
 PATH_KLOG	<syslog.h> /dev/klog no
 PATH_LOGCONF	$(sysconfdir)/syslog.conf
+PATH_LOGCONFD	$(sysconfdir)/syslog.d
 PATH_LOGIN	x $(bindir)/login search:login
 PATH_LOGPID	$(localstatedir)/run/syslog.pid
 PATH_NOLOGIN	$(sysconfdir)/nologin
diff --git a/src/Makefile.am b/src/Makefile.am
index 8b84d7b..826af4c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@ AM_CPPFLAGS = \
 	$(PATHDEF_BSHELL) $(PATHDEF_CONSOLE) $(PATHDEF_CP) \
 	$(PATHDEF_DEFPATH) $(PATHDEF_DEV) $(PATHDEF_INETDCONF) \
 	$(PATHDEF_INETDDIR) $(PATHDEF_INETDPID) $(PATHDEF_KLOG) \
-	$(PATHDEF_LOG) $(PATHDEF_LOGCONF) \
+	$(PATHDEF_LOG) $(PATHDEF_LOGCONF) $(PATHDEF_LOGCONFD) \
 	$(PATHDEF_LOGIN) $(PATHDEF_LOGPID) $(PATHDEF_NOLOGIN) \
 	$(PATHDEF_RLOGIN) $(PATHDEF_RSH) $(PATHDEF_TTY) $(PATHDEF_TTY_PFX) \
 	$(PATHDEF_UTMP) $(PATHDEF_UTMPX) $(PATHDEF_UUCICO)
diff --git a/src/syslogd.c b/src/syslogd.c
index 18a3e41..46e5109 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -105,6 +105,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <dirent.h>
 #include <unistd.h>
 
 #include <stdarg.h>
@@ -137,6 +138,7 @@ int facilities_seen;
 char *selector;			/* Program origin to select.  */
 
 const char *ConfFile = PATH_LOGCONF;	/* Default Configuration file.  */
+const char *ConfDir = PATH_LOGCONFD;	/* Default Configuration directory.  */
 const char *PidFile = PATH_LOGPID;	/* Default path to tuck pid.  */
 char ctty[] = PATH_CONSOLE;	/* Default console to send message info.  */
 
@@ -259,6 +261,7 @@ void domark (int);
 void find_inet_port (const char *);
 void fprintlog (struct filed *, const char *, int, const char *);
 static int load_conffile (const char *, struct filed **);
+static int load_confdir (const char *, struct filed **);
 void init (int);
 void logerror (const char *);
 void logmsg (int, const char *, const char *, int);
@@ -358,6 +361,8 @@ static struct argp_option argp_options[] = {
   {"rcfile", 'f', "FILE", 0, "override configuration file (default: "
    PATH_LOGCONF ")",
    GRP+1},
+  {"rcdir", 'D', "DIR", 0, "override configuration directory (default: "
+   PATH_LOGCONFD ")", GRP+1},
   {"socket", 'p', "FILE", 0, "override default unix domain socket " PATH_LOG,
    GRP+1},
   {"sync", 'S', NULL, 0, "force a file sync on every line", GRP+1},
@@ -449,6 +454,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
       ConfFile = arg;
       break;
 
+    case 'D':
+      ConfDir = arg;
+      break;
+
     case 'p':
       funix[0].name = arg;
       funix[0].fd = -1;
@@ -1797,6 +1806,9 @@ die (int signo)
   exit (EXIT_SUCCESS);
 }
 
+/*
+ * Return zero on error.
+ */
 static int
 load_conffile (const char *filename, struct filed **nextp)
 {
@@ -1989,11 +2001,62 @@ load_conffile (const char *filename, struct filed **nextp)
   return 1;
 }
 
+/*
+ * Return zero on error.
+ */
+static int
+load_confdir (const char *dirname, struct filed **nextp)
+{
+  int rc = 0, found = 0;
+  struct dirent *dent;
+  DIR *dir;
+
+  dir = opendir (dirname);
+  if (dir == NULL)
+    {
+      dbg_printf ("cannot open %s\n", dirname);
+      return 1;		/* Acceptable deviation.  */
+    }
+
+  while ((dent = readdir (dir)) != NULL)
+    {
+      struct stat st;
+      char *file;
+
+      if (asprintf (&file, "%s/%s", dirname, dent->d_name) < 0)
+	{
+	  dbg_printf ("cannot allocate space for configuration filename\n");
+	  return 0;
+	}
+
+      if (stat (file, &st) != 0)
+	{
+	  dbg_printf ("cannot stat file configuration file\n");
+	  continue;
+	}
+
+
+      if (S_ISREG(st.st_mode))
+	{
+	  found++;
+	  rc += load_conffile (file, nextp);
+	}
+
+      free (file);
+    }
+
+  closedir (dir);
+
+  /* An empty directory is acceptable.
+   */
+  return (found ? rc : 1);
+}
+
 /* INIT -- Initialize syslogd from configuration table.  */
 void
 init (int signo _GL_UNUSED_PARAMETER)
 {
-  int rc;
+  int rc, ret;
   struct filed *f, *next, **nextp;
 
   dbg_printf ("init\n");
@@ -2040,6 +2103,10 @@ init (int signo _GL_UNUSED_PARAMETER)
 
   rc = load_conffile (ConfFile, nextp);
 
+  ret = load_confdir (ConfDir, nextp);
+  if (!ret)
+    rc = 0;		/* Some allocation errors were found.  */
+
   Initialized = 1;
 
   if (Debug)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |   29 +++++++++++++++++++++
 NEWS               |    3 ++
 doc/inetutils.texi |    6 ++++
 paths              |    1 +
 src/Makefile.am    |    2 +-
 src/syslogd.c      |   72 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 tests/syslogd.sh   |   10 ++++++-
 7 files changed, 118 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


