From MAILER-DAEMON Sat Jan 02 08:53:50 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NR4QQ-0007BL-FK
	for mharc-commit-inetutils@gnu.org; Sat, 02 Jan 2010 08:53:50 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NR4QM-0007AG-Gt
	for commit-inetutils@gnu.org; Sat, 02 Jan 2010 08:53:46 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NR4QI-00078f-QC
	for commit-inetutils@gnu.org; Sat, 02 Jan 2010 08:53:45 -0500
Received: from [199.232.76.173] (port=42680 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NR4QI-00078V-Kj
	for commit-inetutils@gnu.org; Sat, 02 Jan 2010 08:53:42 -0500
Received: from savannah.gnu.org ([199.232.41.3]:34769 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <ams@gnu.org>) id 1NR4QH-0006Hr-Fx
	for commit-inetutils@gnu.org; Sat, 02 Jan 2010 08:53:42 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69) (envelope-from <ams@gnu.org>)
	id 1NR4QG-0006s2-IF
	for commit-inetutils@gnu.org; Sat, 02 Jan 2010 13:53:40 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <ams@savannah.gnu.org>) id 1NR4QF-0006rO-VL
	for commit-inetutils@gnu.org; Sat, 02 Jan 2010 13:53:40 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6500c6c8b1eb110e4e590015a0cdcb80fc9e3479
X-Git-Newrev: c583418f78ee98caa2cb802cd9c1d703b3280689
Message-Id: <E1NR4QF-0006rO-VL@cvs.savannah.gnu.org>
From: "Alfred M. Szmidt" <ams@gnu.org>
Date: Sat, 02 Jan 2010 13:53:39 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_7-17-gc583418
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Jan 2010 13:53:47 -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  c583418f78ee98caa2cb802cd9c1d703b3280689 (commit)
       via  bceeb8efd61363ea0c4891d690cce6906b2e9b5e (commit)
       via  fd7bfd892a595edbc5caa741bd1a6414fb6fb4ab (commit)
       via  7bb17da3090bb3817a0d569515205d0a2ba8581a (commit)
       via  ff8dd36e67c75b02ba1b27541e1c396c047945c2 (commit)
      from  6500c6c8b1eb110e4e590015a0cdcb80fc9e3479 (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=c583418f78ee98caa2cb802cd9c1d703b3280689


commit c583418f78ee98caa2cb802cd9c1d703b3280689
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Jan 2 14:58:43 2010 +0100

    Updated copyright years for 2010.
    
    Happy New Year!

diff --git a/ChangeLog b/ChangeLog
index b7013be..86688ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7331,7 +7331,8 @@ russion letters.  Thanks to Vladas Lapinskas <lapinskas@mail.iae.lt>.
 	* syslogd/syslogd/syslogd.c: Include <version.h>.
 	(main): Add option -V (version).
 
-    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+    2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ChangeLog.0 b/ChangeLog.0
index 8a24ba9..7049222 100644
--- a/ChangeLog.0
+++ b/ChangeLog.0
@@ -2021,7 +2021,9 @@ Sat Dec 30 06:36:41 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 	* ftpd/ftpcmd.y: Allow `SITE IDLE 0' for non-anonymous user to
 	disable idle timer.
 
-    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+    2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+    Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/Makefile.am b/Makefile.am
index d00cecf..5e81999 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/NEWS b/NEWS
index a4304ad..93b5b13 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 GNU inetutils NEWS -- history of user-visible changes.
 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 See the end of this file for for license conditions.
 
 Please send inetutils bug reports to <bug-inetutils@gnu.org>.
diff --git a/README-alpha b/README-alpha
index f3a53ff..a158e2c 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 Free Software Foundation, Inc.
+2008, 2009, 2010 Free Software Foundation, Inc.
 See end of file for copying conditions.
 
 This document describes the actions needed to build the pre-release or
diff --git a/am/check_macro.m4 b/am/check_macro.m4
index 912d419..2494c7a 100644
--- a/am/check_macro.m4
+++ b/am/check_macro.m4
@@ -1,6 +1,6 @@
 dnl
 dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+dnl 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/check_member.m4 b/am/check_member.m4
index 8914988..ec699ed 100644
--- a/am/check_member.m4
+++ b/am/check_member.m4
@@ -1,6 +1,6 @@
 dnl
 dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+dnl 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/check_weak_refs.m4 b/am/check_weak_refs.m4
index b80ac59..f92bca9 100644
--- a/am/check_weak_refs.m4
+++ b/am/check_weak_refs.m4
@@ -1,6 +1,6 @@
 dnl
 dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+dnl 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/config_paths.m4 b/am/config_paths.m4
index 47dabb7..17aa1d4 100644
--- a/am/config_paths.m4
+++ b/am/config_paths.m4
@@ -1,6 +1,6 @@
 dnl
 dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+dnl 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/enable.m4 b/am/enable.m4
index 98b4648..05868ae 100644
--- a/am/enable.m4
+++ b/am/enable.m4
@@ -1,6 +1,6 @@
 dnl
 dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+dnl 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/flushleft.m4 b/am/flushleft.m4
index 03f058d..2c77eb8 100644
--- a/am/flushleft.m4
+++ b/am/flushleft.m4
@@ -1,6 +1,6 @@
 dnl
 dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+dnl 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/krb5.m4 b/am/krb5.m4
index d436d7b..5bbccda 100644
--- a/am/krb5.m4
+++ b/am/krb5.m4
@@ -1,6 +1,6 @@
 dnl
 dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+dnl 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/libcurses.m4 b/am/libcurses.m4
index 0c2cba4..1ac1c54 100644
--- a/am/libcurses.m4
+++ b/am/libcurses.m4
@@ -1,6 +1,6 @@
 dnl
 dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+dnl 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/am/result.m4 b/am/result.m4
index b63174f..b9b477e 100644
--- a/am/result.m4
+++ b/am/result.m4
@@ -1,6 +1,6 @@
 dnl
 dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+dnl 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
 dnl
diff --git a/bootstrap b/bootstrap
index b7dc9fd..9f3a801 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,8 @@
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2008 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2010 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/bootstrap.conf b/bootstrap.conf
index 9439729..fca66cd 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,5 +1,5 @@
 # bootstrap.conf - Bootstrap configuration.
-# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/cfg.mk b/cfg.mk
index e20313c..ffc7fdc 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/configure.ac b/configure.ac
index 42c4a72..61fdc49 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 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2c8d44e..29a0748 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 #
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+# 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 0ec19be..2cea35f 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -57,7 +57,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 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+2008, 2009, 2010 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 a8937e2..066f824 100644
--- a/ftp/Makefile.am
+++ b/ftp/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 57d58da..79df907 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/cmdtab.c b/ftp/cmdtab.c
index 4ca7427..b9ef5df 100644
--- a/ftp/cmdtab.c
+++ b/ftp/cmdtab.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/domacro.c b/ftp/domacro.c
index 61e2a65..74a0b29 100644
--- a/ftp/domacro.c
+++ b/ftp/domacro.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/extern.h b/ftp/extern.h
index 50f8521..90b89be 100644
--- a/ftp/extern.h
+++ b/ftp/extern.h
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 9c3f5c8..3abf93d 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/ftp_var.h b/ftp/ftp_var.h
index 3e10f22..0c61932 100644
--- a/ftp/ftp_var.h
+++ b/ftp/ftp_var.h
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/main.c b/ftp/main.c
index 76dc579..ae5d76b 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftp/ruserpass.c b/ftp/ruserpass.c
index d3704fe..029c40f 100644
--- a/ftp/ruserpass.c
+++ b/ftp/ruserpass.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/Makefile.am b/ftpd/Makefile.am
index e42d239..cd82c32 100644
--- a/ftpd/Makefile.am
+++ b/ftpd/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ftpd/auth.c b/ftpd/auth.c
index 3c612f6..a06d137 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 Free Software Foundation, Inc.
+  2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/conf.c b/ftpd/conf.c
index 1dcb6b1..9de38a9 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 Free Software Foundation, Inc.
+  2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/extern.h b/ftpd/extern.h
index c7fab20..2483fe6 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 Free Software Foundation,
-  Inc.
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index d48efd4..2eab278 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 Free Software Foundation,
-  Inc.
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 152c64c..3451196 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 Free Software Foundation,
-  Inc.
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/logwtmp.c b/ftpd/logwtmp.c
index a21bd0c..4a825bb 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/pam.c b/ftpd/pam.c
index ae0a2a8..d0023d0 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 Free Software Foundation, Inc.
+  2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/popen.c b/ftpd/popen.c
index 7f55244..9ff67c2 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 Free Software Foundation,
-  Inc.
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ftpd/server_mode.c b/ftpd/server_mode.c
index 226e53c..64f459f 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 Free Software Foundation, Inc.
+  2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/headers/Makefile.am b/headers/Makefile.am
index 1f8435d..4ee15aa 100644
--- a/headers/Makefile.am
+++ b/headers/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/headers/shishi_def.h b/headers/shishi_def.h
index 60f8599..920f79b 100644
--- a/headers/shishi_def.h
+++ b/headers/shishi_def.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-  Inc.
+  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/headers/tftpsubs.h b/headers/tftpsubs.h
index 6c3c270..8a959cb 100644
--- a/headers/tftpsubs.h
+++ b/headers/tftpsubs.h
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009 Free Software Foundation, Inc.
+  2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/hostname/Makefile.am b/hostname/Makefile.am
index 4952559..b34c251 100644
--- a/hostname/Makefile.am
+++ b/hostname/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/hostname/hostname.c b/hostname/hostname.c
index 9e29e86..924fe86 100644
--- a/hostname/hostname.c
+++ b/hostname/hostname.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/Makefile.am b/ifconfig/Makefile.am
index b4501d5..4990465 100644
--- a/ifconfig/Makefile.am
+++ b/ifconfig/Makefile.am
@@ -1,6 +1,6 @@
 #
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+# 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ifconfig/changeif.c b/ifconfig/changeif.c
index 811735f..9848ab7 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/flags.c b/ifconfig/flags.c
index cc133a2..78870bf 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/flags.h b/ifconfig/flags.h
index ab2a9ab..516efae 100644
--- a/ifconfig/flags.h
+++ b/ifconfig/flags.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/if_index.c b/ifconfig/if_index.c
index bb5c2b5..1baa1ea 100644
--- a/ifconfig/if_index.c
+++ b/ifconfig/if_index.c
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/if_index.h b/ifconfig/if_index.h
index ec97ad7..7b9ade6 100644
--- a/ifconfig/if_index.h
+++ b/ifconfig/if_index.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/ifconfig.c b/ifconfig/ifconfig.c
index b55bb06..988355a 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/ifconfig.h b/ifconfig/ifconfig.h
index c4e1238..30a7081 100644
--- a/ifconfig/ifconfig.h
+++ b/ifconfig/ifconfig.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/options.c b/ifconfig/options.c
index 82401fd..0ee1921 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/options.h b/ifconfig/options.h
index d97afce..e578666 100644
--- a/ifconfig/options.h
+++ b/ifconfig/options.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index 3c175bf..784185a 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/printif.h b/ifconfig/printif.h
index a82ee64..9038572 100644
--- a/ifconfig/printif.h
+++ b/ifconfig/printif.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system.c b/ifconfig/system.c
index e1ff2a8..3349187 100644
--- a/ifconfig/system.c
+++ b/ifconfig/system.c
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system.h b/ifconfig/system.h
index f84c08e..0a74da8 100644
--- a/ifconfig/system.h
+++ b/ifconfig/system.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/Makefile.am b/ifconfig/system/Makefile.am
index 2b72283..0582751 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
-# Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+# 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ifconfig/system/generic.c b/ifconfig/system/generic.c
index ce7dd17..8952b6c 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/generic.h b/ifconfig/system/generic.h
index 300be93..eb6c5ef 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/hpux.c b/ifconfig/system/hpux.c
index 8448806..0841804 100644
--- a/ifconfig/system/hpux.c
+++ b/ifconfig/system/hpux.c
@@ -1,6 +1,6 @@
 /* hpux.c -- HPUX specific code for ifconfig
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/hpux.h b/ifconfig/system/hpux.h
index 6395a41..3a18304 100644
--- a/ifconfig/system/hpux.h
+++ b/ifconfig/system/hpux.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
index d5d7dd2..4af9186 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/linux.h b/ifconfig/system/linux.h
index 7cca9ca..bd11e5b 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/osf.c b/ifconfig/system/osf.c
index 9b1fd11..03aca38 100644
--- a/ifconfig/system/osf.c
+++ b/ifconfig/system/osf.c
@@ -1,6 +1,6 @@
 /* osf.c -- OSF specific code for ifconfig
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/osf.h b/ifconfig/system/osf.h
index 3be7009..cda7d24 100644
--- a/ifconfig/system/osf.h
+++ b/ifconfig/system/osf.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/qnx.c b/ifconfig/system/qnx.c
index 3e73c1c..05a6b37 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/qnx.h b/ifconfig/system/qnx.h
index 92ecc6a..04a6c48 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/solaris.c b/ifconfig/system/solaris.c
index 33699b5..81e06c8 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ifconfig/system/solaris.h b/ifconfig/system/solaris.h
index 1611922..ce20c33 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/inetd/Makefile.am b/inetd/Makefile.am
index ff211d7..d5f6a54 100644
--- a/inetd/Makefile.am
+++ b/inetd/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/inetd/inetd.c b/inetd/inetd.c
index d427abb..ad735c1 100644
--- a/inetd/inetd.c
+++ b/inetd/inetd.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-  Inc.
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e2b0f22..dbcf258 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile for gnulib/lib				-*-Makefile-*-
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libicmp/Makefile.am b/libicmp/Makefile.am
index 0e38470..5bf9287 100644
--- a/libicmp/Makefile.am
+++ b/libicmp/Makefile.am
@@ -1,6 +1,6 @@
 #
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+# 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libicmp/icmp.h b/libicmp/icmp.h
index 4951e7f..3bc819d 100644
--- a/libicmp/icmp.h
+++ b/libicmp/icmp.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_address.c b/libicmp/icmp_address.c
index a4a7825..e86e075 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_cksum.c b/libicmp/icmp_cksum.c
index f49e252..a295972 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_echo.c b/libicmp/icmp_echo.c
index 749433f..febb56c 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libicmp/icmp_timestamp.c b/libicmp/icmp_timestamp.c
index dadbfb4..ed2605c 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/Makefile.am b/libinetutils/Makefile.am
index 217609b..a45b859 100644
--- a/libinetutils/Makefile.am
+++ b/libinetutils/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libinetutils/argcv.c b/libinetutils/argcv.c
index bcc0758..b1d2862 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/argcv.h b/libinetutils/argcv.h
index eb3635e..e32ed46 100644
--- a/libinetutils/argcv.h
+++ b/libinetutils/argcv.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/cleansess.c b/libinetutils/cleansess.c
index 4cd8b30..9d998d6 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/daemon.c b/libinetutils/daemon.c
index f07044e..a6834e0 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/defauthors.c b/libinetutils/defauthors.c
index 0bbbd34..11f9af3 100644
--- a/libinetutils/defauthors.c
+++ b/libinetutils/defauthors.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009 Free Software Foundation, Inc.
+  Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/des_rw.c b/libinetutils/des_rw.c
index 7b77f36..cf93d6e 100644
--- a/libinetutils/des_rw.c
+++ b/libinetutils/des_rw.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 0a10cba..7b046be 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/krcmd.c b/libinetutils/krcmd.c
index 17a1f25..9c7871e 100644
--- a/libinetutils/krcmd.c
+++ b/libinetutils/krcmd.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/libinetutils.h b/libinetutils/libinetutils.h
index dccd7ae..81a3a77 100644
--- a/libinetutils/libinetutils.h
+++ b/libinetutils/libinetutils.h
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/localhost.c b/libinetutils/localhost.c
index 54f198d..7b60f9b 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/logwtmp.c b/libinetutils/logwtmp.c
index 0940967..e4eddad 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 Free Software Foundation, Inc.
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/logwtmpko.c b/libinetutils/logwtmpko.c
index ccfe835..8ac651e 100644
--- a/libinetutils/logwtmpko.c
+++ b/libinetutils/logwtmpko.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/setsig.c b/libinetutils/setsig.c
index 7c8a428..5b94f59 100644
--- a/libinetutils/setsig.c
+++ b/libinetutils/setsig.c
@@ -1,6 +1,6 @@
 /* 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 Free Software Foundation, Inc.
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/shishi.c b/libinetutils/shishi.c
index 9c6be8e..f06f95d 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 Free Software Foundation,
-  Inc.
+  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/tftpsubs.c b/libinetutils/tftpsubs.c
index 0d2fc3e..6eb0a09 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 Free Software Foundation, Inc.
+  2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/ttymsg.c b/libinetutils/ttymsg.c
index 1e35363..8b948b7 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/utmp_init.c b/libinetutils/utmp_init.c
index 07fe050..0a686c3 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 Free Software Foundation, Inc.
+  2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libinetutils/utmp_logout.c b/libinetutils/utmp_logout.c
index cc36494..aed9530 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 Free Software Foundation, Inc.
+  2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/Makefile.am b/libls/Makefile.am
index bf62b14..b5fe1f5 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 Free Software Foundation, Inc.
+# 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libls/cmp.c b/libls/cmp.c
index b674182..0182871 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 Free Software Foundation, Inc.
+  2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/extern.h b/libls/extern.h
index 1bfcbf6..ffb0e69 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 Free Software Foundation, Inc.
+  2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/fts.c b/libls/fts.c
index 7039937..423ae33 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 Free Software Foundation, Inc.
+  2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/fts.h b/libls/fts.h
index 4123e64..0bc514d 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 Free Software Foundation, Inc.
+  2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/ls.c b/libls/ls.c
index d710794..47dff12 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 Free Software Foundation, Inc.
+  2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/ls.h b/libls/ls.h
index 606146f..b524643 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 Free Software Foundation, Inc.
+  2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/print.c b/libls/print.c
index ca7b4fa..7187834 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 Free Software Foundation, Inc.
+  2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/stat_flags.c b/libls/stat_flags.c
index 476a5a1..ae224f2 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 Free Software Foundation, Inc.
+  2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libls/util.c b/libls/util.c
index 8cc1d9d..edbbaab 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 Free Software Foundation, Inc.
+  2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/Makefile.am b/libtelnet/Makefile.am
index a234750..45135c2 100644
--- a/libtelnet/Makefile.am
+++ b/libtelnet/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/libtelnet/auth-proto.h b/libtelnet/auth-proto.h
index 8dcabea..52c8bd2 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index 143fb1f..7147e28 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/auth.h b/libtelnet/auth.h
index 1102c35..6bd2d14 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/enc-proto.h b/libtelnet/enc-proto.h
index 2e09f28..cde51bd 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/enc_des.c b/libtelnet/enc_des.c
index d7f875d..c7dacb5 100644
--- a/libtelnet/enc_des.c
+++ b/libtelnet/enc_des.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index a7056ec..ad6de54 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/encrypt.h b/libtelnet/encrypt.h
index 600cac3..b10dfce 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/forward.c b/libtelnet/forward.c
index cff68ba..ec6d8db 100644
--- a/libtelnet/forward.c
+++ b/libtelnet/forward.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/genget.c b/libtelnet/genget.c
index 0328f7a..ad0693e 100644
--- a/libtelnet/genget.c
+++ b/libtelnet/genget.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/genget.h b/libtelnet/genget.h
index 2206dbc..0323d7c 100644
--- a/libtelnet/genget.h
+++ b/libtelnet/genget.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009 Free Software Foundation, Inc.
+  Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/getent.c b/libtelnet/getent.c
index 683d7fb..9f8a78c 100644
--- a/libtelnet/getent.c
+++ b/libtelnet/getent.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/kerberos.c b/libtelnet/kerberos.c
index d512557..b084142 100644
--- a/libtelnet/kerberos.c
+++ b/libtelnet/kerberos.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index e82ec72..d3ba01c 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/libtelnet/key-proto.h b/libtelnet/key-proto.h
index c939123..c0ce2e2 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/misc-proto.h b/libtelnet/misc-proto.h
index af52181..2f583f4 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/misc.c b/libtelnet/misc.c
index 61098f6..e6e463f 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/misc.h b/libtelnet/misc.h
index bdef8c1..47e12e1 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/read_passwd.c b/libtelnet/read_passwd.c
index 9acf63c..b22cd2f 100644
--- a/libtelnet/read_passwd.c
+++ b/libtelnet/read_passwd.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index 33b267f..d37569e 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-  Foundation, Inc.
+  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+  Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/logger/Makefile.am b/logger/Makefile.am
index 8316517..8466354 100644
--- a/logger/Makefile.am
+++ b/logger/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009 Free Software Foundation, Inc.
+# 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/logger/logger.c b/logger/logger.c
index d5c684d..d0cb2d7 100644
--- a/logger/logger.c
+++ b/logger/logger.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009 Free Software Foundation, Inc.
+  Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/man/Makefile.am b/man/Makefile.am
index 2a0ab80..0be8462 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/paths b/paths
index a0117f2..5242215 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 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ping/Makefile.am b/ping/Makefile.am
index ec275f6..80e3578 100644
--- a/ping/Makefile.am
+++ b/ping/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/ping/libping.c b/ping/libping.c
index ae358e3..5e240f2 100644
--- a/ping/libping.c
+++ b/ping/libping.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping.c b/ping/ping.c
index 35c261f..b65053e 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 Free Software Foundation, Inc.
+  2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping.h b/ping/ping.h
index c7a9306..1b3aeda 100644
--- a/ping/ping.h
+++ b/ping/ping.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping6.c b/ping/ping6.c
index ecde6c2..d0c89d7 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-  Inc.
+  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping6.h b/ping/ping6.h
index 75c4190..b9203d0 100644
--- a/ping/ping6.h
+++ b/ping/ping6.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-  Inc.
+  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_address.c b/ping/ping_address.c
index bed8093..f40a3ac 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_common.c b/ping/ping_common.c
index 4206d52..cbe1740 100644
--- a/ping/ping_common.c
+++ b/ping/ping_common.c
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-  Inc.
+  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_common.h b/ping/ping_common.h
index cc711f8..9ec4406 100644
--- a/ping/ping_common.h
+++ b/ping/ping_common.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-  Inc.
+  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_echo.c b/ping/ping_echo.c
index d8b6629..95cf4b3 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_impl.h b/ping/ping_impl.h
index 9ffd6f5..e1d511e 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_router.c b/ping/ping_router.c
index c5bf0b2..535fa2b 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/ping/ping_timestamp.c b/ping/ping_timestamp.c
index f7ad826..6e251a6 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
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/rcp/Makefile.am b/rcp/Makefile.am
index d168abf..9bb37cd 100644
--- a/rcp/Makefile.am
+++ b/rcp/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/rcp/rcp.c b/rcp/rcp.c
index ccf3aca..fa1c4ee 100644
--- a/rcp/rcp.c
+++ b/rcp/rcp.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/rexec/Makefile.am b/rexec/Makefile.am
index d132afb..3e10273 100644
--- a/rexec/Makefile.am
+++ b/rexec/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/rexec/rexec.c b/rexec/rexec.c
index 3a1e17f..d31c5bb 100644
--- a/rexec/rexec.c
+++ b/rexec/rexec.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009 Free Software Foundation, Inc.
+  Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/rexecd/Makefile.am b/rexecd/Makefile.am
index a0b83cd..6365ea4 100644
--- a/rexecd/Makefile.am
+++ b/rexecd/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/rexecd/rexecd.c b/rexecd/rexecd.c
index 61fbcc1..e2e014b 100644
--- a/rexecd/rexecd.c
+++ b/rexecd/rexecd.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/rlogin/Makefile.am b/rlogin/Makefile.am
index d6322a6..1703877 100644
--- a/rlogin/Makefile.am
+++ b/rlogin/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/rlogin/rlogin.c b/rlogin/rlogin.c
index 0530baf..70d0efa 100644
--- a/rlogin/rlogin.c
+++ b/rlogin/rlogin.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/rlogind/Makefile.am b/rlogind/Makefile.am
index 6f90142..498c1bc 100644
--- a/rlogind/Makefile.am
+++ b/rlogind/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/rlogind/rlogind.c b/rlogind/rlogind.c
index e36b7f8..34eb76e 100644
--- a/rlogind/rlogind.c
+++ b/rlogind/rlogind.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/rsh/Makefile.am b/rsh/Makefile.am
index 82eb005..f1ede38 100644
--- a/rsh/Makefile.am
+++ b/rsh/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/rsh/rsh.c b/rsh/rsh.c
index 28e46b7..3bdc4b8 100644
--- a/rsh/rsh.c
+++ b/rsh/rsh.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/rshd/Makefile.am b/rshd/Makefile.am
index c48db3e..bec2948 100644
--- a/rshd/Makefile.am
+++ b/rshd/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/rshd/rshd.c b/rshd/rshd.c
index bff32b4..173f0d5 100644
--- a/rshd/rshd.c
+++ b/rshd/rshd.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-  Inc.
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/syslogd/Makefile.am b/syslogd/Makefile.am
index 889810f..1054a24 100644
--- a/syslogd/Makefile.am
+++ b/syslogd/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/syslogd/syslogd.c b/syslogd/syslogd.c
index 6917f81..5543448 100644
--- a/syslogd/syslogd.c
+++ b/syslogd/syslogd.c
@@ -1,6 +1,6 @@
 /* syslogd - log system messages
   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/Makefile.am b/talk/Makefile.am
index 1be8e8f..c618238 100644
--- a/talk/Makefile.am
+++ b/talk/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/talk/ctl.c b/talk/ctl.c
index 1a10ad0..8459bb8 100644
--- a/talk/ctl.c
+++ b/talk/ctl.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/ctl_transact.c b/talk/ctl_transact.c
index bcbf068..33009a9 100644
--- a/talk/ctl_transact.c
+++ b/talk/ctl_transact.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/display.c b/talk/display.c
index 62f7e5c..0bc97b2 100644
--- a/talk/display.c
+++ b/talk/display.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/get_addrs.c b/talk/get_addrs.c
index 35ff8e7..d3be196 100644
--- a/talk/get_addrs.c
+++ b/talk/get_addrs.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/get_names.c b/talk/get_names.c
index a638334..19e608b 100644
--- a/talk/get_names.c
+++ b/talk/get_names.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/init_disp.c b/talk/init_disp.c
index 2f65cb5..29790c7 100644
--- a/talk/init_disp.c
+++ b/talk/init_disp.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/invite.c b/talk/invite.c
index 17022ea..37449fb 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/io.c b/talk/io.c
index ac83880..d485627 100644
--- a/talk/io.c
+++ b/talk/io.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/look_up.c b/talk/look_up.c
index 7d63496..d07bebf 100644
--- a/talk/look_up.c
+++ b/talk/look_up.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/msgs.c b/talk/msgs.c
index 3e37303..2bbf532 100644
--- a/talk/msgs.c
+++ b/talk/msgs.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/talk.c b/talk/talk.c
index 084dc05..d6bdd8f 100644
--- a/talk/talk.c
+++ b/talk/talk.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/talk.h b/talk/talk.h
index 5c3c157..8f3650c 100644
--- a/talk/talk.h
+++ b/talk/talk.h
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talk/talk_ctl.h b/talk/talk_ctl.h
index d1f5f1b..6cdba6e 100644
--- a/talk/talk_ctl.h
+++ b/talk/talk_ctl.h
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/Makefile.am b/talkd/Makefile.am
index c74d829..eea1429 100644
--- a/talkd/Makefile.am
+++ b/talkd/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/talkd/acl.c b/talkd/acl.c
index 0bc9f9b..9813741 100644
--- a/talkd/acl.c
+++ b/talkd/acl.c
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/announce.c b/talkd/announce.c
index d59a037..8b3e98f 100644
--- a/talkd/announce.c
+++ b/talkd/announce.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-  Inc.
+  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+  Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/intalkd.h b/talkd/intalkd.h
index 5f09b30..d9efd24 100644
--- a/talkd/intalkd.h
+++ b/talkd/intalkd.h
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/print.c b/talkd/print.c
index ce8af55..0f31610 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/process.c b/talkd/process.c
index 0dbbe15..acb9290 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/table.c b/talkd/table.c
index 85f0c3d..13419b5 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/talkd/talkd.c b/talkd/talkd.c
index 98dd446..a191c3a 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/Makefile.am b/telnet/Makefile.am
index df26a6a..7a3204b 100644
--- a/telnet/Makefile.am
+++ b/telnet/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/telnet/authenc.c b/telnet/authenc.c
index db2950b..96596fa 100644
--- a/telnet/authenc.c
+++ b/telnet/authenc.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/commands.c b/telnet/commands.c
index 320be85..05c6705 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/defines.h b/telnet/defines.h
index 2b0a860..93c7d49 100644
--- a/telnet/defines.h
+++ b/telnet/defines.h
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/externs.h b/telnet/externs.h
index d0ba266..b24c9f6 100644
--- a/telnet/externs.h
+++ b/telnet/externs.h
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/fdset.h b/telnet/fdset.h
index 22e8970..d171d0e 100644
--- a/telnet/fdset.h
+++ b/telnet/fdset.h
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/general.h b/telnet/general.h
index 7d1a0bf..dba49ff 100644
--- a/telnet/general.h
+++ b/telnet/general.h
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/krb4-proto.h b/telnet/krb4-proto.h
index d4237d1..ea411ec 100644
--- a/telnet/krb4-proto.h
+++ b/telnet/krb4-proto.h
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/main.c b/telnet/main.c
index 3a08647..d4c1cee 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/network.c b/telnet/network.c
index 6a70772..09eb5d5 100644
--- a/telnet/network.c
+++ b/telnet/network.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/ring.c b/telnet/ring.c
index b892479..d6ce5c3 100644
--- a/telnet/ring.c
+++ b/telnet/ring.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/ring.h b/telnet/ring.h
index e7500e5..fec4882 100644
--- a/telnet/ring.h
+++ b/telnet/ring.h
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index 1e47fbd..e913ab9 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/telnet.c b/telnet/telnet.c
index f43345d..586db9a 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/terminal.c b/telnet/terminal.c
index fbc641d..feb6f6e 100644
--- a/telnet/terminal.c
+++ b/telnet/terminal.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/tn3270.c b/telnet/tn3270.c
index 4afd957..418e8c5 100644
--- a/telnet/tn3270.c
+++ b/telnet/tn3270.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/types.h b/telnet/types.h
index 5704da3..08d5d57 100644
--- a/telnet/types.h
+++ b/telnet/types.h
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnet/utilities.c b/telnet/utilities.c
index 46151fd..274f32f 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index 2e872aa..9b9aa77 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/telnetd/pty.c b/telnetd/pty.c
index cead620..f0f93ae 100644
--- a/telnetd/pty.c
+++ b/telnetd/pty.c
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
-  Software Foundation, Inc.
+  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/slc.c b/telnetd/slc.c
index 9a5caef..7ff469e 100644
--- a/telnetd/slc.c
+++ b/telnetd/slc.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/telnetd/state.c b/telnetd/state.c
index 29b2507..158e6bb 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index d0d2b41..e751831 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/telnetd/telnetd.h b/telnetd/telnetd.h
index a9f510d..677fcea 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 Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/term.c b/telnetd/term.c
index d82b9a2..33c71e2 100644
--- a/telnetd/term.c
+++ b/telnetd/term.c
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
-  Software Foundation, Inc.
+  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/telnetd/termstat.c b/telnetd/termstat.c
index 0743d7c..a8b0c86 100644
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 91e8dd1..8f22f15 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b29260c..1d94a5d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/localhost.c b/tests/localhost.c
index a3daeec..0b8e03d 100644
--- a/tests/localhost.c
+++ b/tests/localhost.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tests/ping-localhost.sh b/tests/ping-localhost.sh
index a53b3a7..35bf87c 100755
--- a/tests/ping-localhost.sh
+++ b/tests/ping-localhost.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tests/traceroute-localhost.sh b/tests/traceroute-localhost.sh
index 46599aa..15563e0 100755
--- a/tests/traceroute-localhost.sh
+++ b/tests/traceroute-localhost.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tftp/Makefile.am b/tftp/Makefile.am
index e038477..472da61 100644
--- a/tftp/Makefile.am
+++ b/tftp/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tftp/extern.h b/tftp/extern.h
index e654bef..3ad4a16 100644
--- a/tftp/extern.h
+++ b/tftp/extern.h
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tftp/main.c b/tftp/main.c
index aaeb1d7..6b76457 100644
--- a/tftp/main.c
+++ b/tftp/main.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tftp/tftp.c b/tftp/tftp.c
index 90bbde6..17ffea0 100644
--- a/tftp/tftp.c
+++ b/tftp/tftp.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/tftpd/Makefile.am b/tftpd/Makefile.am
index 7d0624f..436f7ca 100644
--- a/tftpd/Makefile.am
+++ b/tftpd/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c
index 05ea335..ec8f539 100644
--- a/tftpd/tftpd.c
+++ b/tftpd/tftpd.c
@@ -1,6 +1,7 @@
 /*
   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+  Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/traceroute/Makefile.am b/traceroute/Makefile.am
index a407536..41d6e61 100644
--- a/traceroute/Makefile.am
+++ b/traceroute/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/traceroute/traceroute.c b/traceroute/traceroute.c
index ab40376..e12c30e 100644
--- a/traceroute/traceroute.c
+++ b/traceroute/traceroute.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/uucpd/Makefile.am b/uucpd/Makefile.am
index d866106..5e3426c 100644
--- a/uucpd/Makefile.am
+++ b/uucpd/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/uucpd/uucpd.c b/uucpd/uucpd.c
index 5388d0f..b1b5071 100644
--- a/uucpd/uucpd.c
+++ b/uucpd/uucpd.c
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   Foundation, Inc.
 
   This file is part of GNU Inetutils.
diff --git a/whois/Makefile.am b/whois/Makefile.am
index a861fa1..00768e7 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 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
diff --git a/whois/data.h b/whois/data.h
index 17a417d..4cf0880 100644
--- a/whois/data.h
+++ b/whois/data.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009 Free Software Foundation, Inc.
+  Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/whois/whois.c b/whois/whois.c
index da13082..9552564 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 Free Software Foundation, Inc.
+  2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 
diff --git a/whois/whois.h b/whois/whois.h
index 2fa4571..3d1e389 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 Free Software Foundation, Inc.
+  2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Inetutils.
 

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


commit bceeb8efd61363ea0c4891d690cce6906b2e9b5e
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Jan 2 14:39:17 2010 +0100

    Added copyright notice.  (silent change)

diff --git a/ChangeLog.0 b/ChangeLog.0
index ff362d3..8a24ba9 100644
--- a/ChangeLog.0
+++ b/ChangeLog.0
@@ -2020,4 +2020,20 @@ Sat Dec 30 06:36:41 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
 	* ftpd/ftpcmd.y: Allow `SITE IDLE 0' for non-anonymous user to
 	disable idle timer.
+
+    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'.

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


commit fd7bfd892a595edbc5caa741bd1a6414fb6fb4ab
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Jan 2 14:38:32 2010 +0100

    man/.gitignore: Added `*.8' to list.

diff --git a/ChangeLog b/ChangeLog
index c80e718..b7013be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-12-28  Alfred M. Szmidt  <ams@gnu.org>
 
+	* man/.gitignore: Added `*.8' to list.
+
+2009-12-28  Alfred M. Szmidt  <ams@gnu.org>
+
 	* bootstrap.conf (gnulib_modules): Added `update-copyright' to
 	list.
 
@@ -7326,3 +7330,20 @@ russion letters.  Thanks to Vladas Lapinskas <lapinskas@mail.iae.lt>.
 	* syslogd/syslogd/syslogd.c: Fixed typo in comment.
 	* syslogd/syslogd/syslogd.c: Include <version.h>.
 	(main): Add option -V (version).
+
+    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'.
diff --git a/man/.gitignore b/man/.gitignore
index f7e585b..c8df91b 100644
--- a/man/.gitignore
+++ b/man/.gitignore
@@ -1 +1,2 @@
 *.1
+*.8

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


commit 7bb17da3090bb3817a0d569515205d0a2ba8581a
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Dec 28 13:54:34 2009 +0100

    bootstrap.conf (gnulib_modules): Added `update-copyright' to list.

diff --git a/ChangeLog b/ChangeLog
index 8b17435..c80e718 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-28  Alfred M. Szmidt  <ams@gnu.org>
+
+	* bootstrap.conf (gnulib_modules): Added `update-copyright' to
+	list.
+
 2009-12-28  Giuseppe Scrivano  <gscrivano@gnu.org>
 
 	* man/ping6.h2m: New file.
diff --git a/bootstrap.conf b/bootstrap.conf
index 43e7a0c..9439729 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -69,6 +69,7 @@ strnlen
 sysexits
 unistd-safer
 unlocked-io
+update-copyright
 vasnprintf
 version-etc-fsf
 vsnprintf

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


commit ff8dd36e67c75b02ba1b27541e1c396c047945c2
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Dec 28 13:53:44 2009 +0100

    Added copyright notice. (silent change)

diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index b946523..d48efd4 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -1,4 +1,24 @@
 /*
+  Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+  2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
+
+  This file is part of GNU Inetutils.
+
+  GNU Inetutils is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at
+  your option) any later version.
+
+  GNU Inetutils is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/*
  * Copyright (c) 1985, 1988, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *

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

Summary of changes:
 ChangeLog                     |   27 +++++++++++++++++++++++++++
 ChangeLog.0                   |   18 ++++++++++++++++++
 Makefile.am                   |    2 +-
 NEWS                          |    2 +-
 README-alpha                  |    2 +-
 am/check_macro.m4             |    2 +-
 am/check_member.m4            |    2 +-
 am/check_weak_refs.m4         |    2 +-
 am/config_paths.m4            |    2 +-
 am/enable.m4                  |    2 +-
 am/flushleft.m4               |    2 +-
 am/krb5.m4                    |    2 +-
 am/libcurses.m4               |    2 +-
 am/result.m4                  |    2 +-
 bootstrap                     |    3 ++-
 bootstrap.conf                |    3 ++-
 cfg.mk                        |    2 +-
 configure.ac                  |    2 +-
 doc/Makefile.am               |    4 ++--
 doc/inetutils.texi            |    3 ++-
 ftp/Makefile.am               |    2 +-
 ftp/cmds.c                    |    3 ++-
 ftp/cmdtab.c                  |    3 ++-
 ftp/domacro.c                 |    3 ++-
 ftp/extern.h                  |    3 ++-
 ftp/ftp.c                     |    3 ++-
 ftp/ftp_var.h                 |    3 ++-
 ftp/main.c                    |    3 ++-
 ftp/ruserpass.c               |    3 ++-
 ftpd/Makefile.am              |    2 +-
 ftpd/auth.c                   |    2 +-
 ftpd/conf.c                   |    2 +-
 ftpd/extern.h                 |    4 ++--
 ftpd/ftpcmd.y                 |   20 ++++++++++++++++++++
 ftpd/ftpd.c                   |    4 ++--
 ftpd/logwtmp.c                |    2 +-
 ftpd/pam.c                    |    2 +-
 ftpd/popen.c                  |    4 ++--
 ftpd/server_mode.c            |    2 +-
 headers/Makefile.am           |    2 +-
 headers/shishi_def.h          |    4 ++--
 headers/tftpsubs.h            |    2 +-
 hostname/Makefile.am          |    2 +-
 hostname/hostname.c           |    2 +-
 ifconfig/Makefile.am          |    4 ++--
 ifconfig/changeif.c           |    4 ++--
 ifconfig/flags.c              |    4 ++--
 ifconfig/flags.h              |    4 ++--
 ifconfig/if_index.c           |    4 ++--
 ifconfig/if_index.h           |    4 ++--
 ifconfig/ifconfig.c           |    4 ++--
 ifconfig/ifconfig.h           |    4 ++--
 ifconfig/options.c            |    4 ++--
 ifconfig/options.h            |    4 ++--
 ifconfig/printif.c            |    4 ++--
 ifconfig/printif.h            |    4 ++--
 ifconfig/system.c             |    4 ++--
 ifconfig/system.h             |    4 ++--
 ifconfig/system/Makefile.am   |    4 ++--
 ifconfig/system/generic.c     |    4 ++--
 ifconfig/system/generic.h     |    4 ++--
 ifconfig/system/hpux.c        |    4 ++--
 ifconfig/system/hpux.h        |    4 ++--
 ifconfig/system/linux.c       |    4 ++--
 ifconfig/system/linux.h       |    4 ++--
 ifconfig/system/osf.c         |    4 ++--
 ifconfig/system/osf.h         |    4 ++--
 ifconfig/system/qnx.c         |    4 ++--
 ifconfig/system/qnx.h         |    4 ++--
 ifconfig/system/solaris.c     |    4 ++--
 ifconfig/system/solaris.h     |    4 ++--
 inetd/Makefile.am             |    2 +-
 inetd/inetd.c                 |    4 ++--
 lib/Makefile.am               |    4 ++--
 libicmp/Makefile.am           |    4 ++--
 libicmp/icmp.h                |    4 ++--
 libicmp/icmp_address.c        |    4 ++--
 libicmp/icmp_cksum.c          |    4 ++--
 libicmp/icmp_echo.c           |    4 ++--
 libicmp/icmp_timestamp.c      |    4 ++--
 libinetutils/Makefile.am      |    2 +-
 libinetutils/argcv.c          |    4 ++--
 libinetutils/argcv.h          |    4 ++--
 libinetutils/cleansess.c      |    2 +-
 libinetutils/daemon.c         |    2 +-
 libinetutils/defauthors.c     |    2 +-
 libinetutils/des_rw.c         |    2 +-
 libinetutils/kcmd.c           |    2 +-
 libinetutils/krcmd.c          |    2 +-
 libinetutils/libinetutils.h   |    3 ++-
 libinetutils/localhost.c      |    2 +-
 libinetutils/logwtmp.c        |    2 +-
 libinetutils/logwtmpko.c      |    2 +-
 libinetutils/setsig.c         |    2 +-
 libinetutils/shishi.c         |    4 ++--
 libinetutils/tftpsubs.c       |    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         |    2 +-
 libtelnet/auth-proto.h        |    2 +-
 libtelnet/auth.c              |    2 +-
 libtelnet/auth.h              |    2 +-
 libtelnet/enc-proto.h         |    2 +-
 libtelnet/enc_des.c           |    2 +-
 libtelnet/encrypt.c           |    2 +-
 libtelnet/encrypt.h           |    2 +-
 libtelnet/forward.c           |    2 +-
 libtelnet/genget.c            |    2 +-
 libtelnet/genget.h            |    2 +-
 libtelnet/getent.c            |    2 +-
 libtelnet/kerberos.c          |    2 +-
 libtelnet/kerberos5.c         |    2 +-
 libtelnet/key-proto.h         |    2 +-
 libtelnet/misc-proto.h        |    2 +-
 libtelnet/misc.c              |    2 +-
 libtelnet/misc.h              |    2 +-
 libtelnet/read_passwd.c       |    2 +-
 libtelnet/shishi.c            |    4 ++--
 logger/Makefile.am            |    2 +-
 logger/logger.c               |    2 +-
 man/.gitignore                |    1 +
 man/Makefile.am               |    2 +-
 paths                         |    2 +-
 ping/Makefile.am              |    2 +-
 ping/libping.c                |    2 +-
 ping/ping.c                   |    2 +-
 ping/ping.h                   |    2 +-
 ping/ping6.c                  |    4 ++--
 ping/ping6.h                  |    4 ++--
 ping/ping_address.c           |    4 ++--
 ping/ping_common.c            |    4 ++--
 ping/ping_common.h            |    4 ++--
 ping/ping_echo.c              |    4 ++--
 ping/ping_impl.h              |    4 ++--
 ping/ping_router.c            |    4 ++--
 ping/ping_timestamp.c         |    4 ++--
 rcp/Makefile.am               |    2 +-
 rcp/rcp.c                     |    3 ++-
 rexec/Makefile.am             |    2 +-
 rexec/rexec.c                 |    2 +-
 rexecd/Makefile.am            |    2 +-
 rexecd/rexecd.c               |    2 +-
 rlogin/Makefile.am            |    2 +-
 rlogin/rlogin.c               |    3 ++-
 rlogind/Makefile.am           |    2 +-
 rlogind/rlogind.c             |    2 +-
 rsh/Makefile.am               |    2 +-
 rsh/rsh.c                     |    3 ++-
 rshd/Makefile.am              |    2 +-
 rshd/rshd.c                   |    4 ++--
 syslogd/Makefile.am           |    2 +-
 syslogd/syslogd.c             |    2 +-
 talk/Makefile.am              |    2 +-
 talk/ctl.c                    |    3 ++-
 talk/ctl_transact.c           |    3 ++-
 talk/display.c                |    3 ++-
 talk/get_addrs.c              |    3 ++-
 talk/get_names.c              |    3 ++-
 talk/init_disp.c              |    3 ++-
 talk/invite.c                 |    3 ++-
 talk/io.c                     |    3 ++-
 talk/look_up.c                |    3 ++-
 talk/msgs.c                   |    3 ++-
 talk/talk.c                   |    3 ++-
 talk/talk.h                   |    3 ++-
 talk/talk_ctl.h               |    3 ++-
 talkd/Makefile.am             |    2 +-
 talkd/acl.c                   |    4 ++--
 talkd/announce.c              |    4 ++--
 talkd/intalkd.h               |    4 ++--
 talkd/print.c                 |    2 +-
 talkd/process.c               |    2 +-
 talkd/table.c                 |    2 +-
 talkd/talkd.c                 |    2 +-
 telnet/Makefile.am            |    2 +-
 telnet/authenc.c              |    3 ++-
 telnet/commands.c             |    3 ++-
 telnet/defines.h              |    3 ++-
 telnet/externs.h              |    3 ++-
 telnet/fdset.h                |    3 ++-
 telnet/general.h              |    3 ++-
 telnet/krb4-proto.h           |    3 ++-
 telnet/main.c                 |    3 ++-
 telnet/network.c              |    3 ++-
 telnet/ring.c                 |    3 ++-
 telnet/ring.h                 |    3 ++-
 telnet/sys_bsd.c              |    3 ++-
 telnet/telnet.c               |    3 ++-
 telnet/terminal.c             |    3 ++-
 telnet/tn3270.c               |    3 ++-
 telnet/types.h                |    3 ++-
 telnet/utilities.c            |    3 ++-
 telnetd/Makefile.am           |    2 +-
 telnetd/pty.c                 |    4 ++--
 telnetd/slc.c                 |    2 +-
 telnetd/state.c               |    2 +-
 telnetd/telnetd.c             |    2 +-
 telnetd/telnetd.h             |    2 +-
 telnetd/term.c                |    4 ++--
 telnetd/termstat.c            |    2 +-
 telnetd/utility.c             |    2 +-
 tests/Makefile.am             |    2 +-
 tests/localhost.c             |    2 +-
 tests/ping-localhost.sh       |    2 +-
 tests/traceroute-localhost.sh |    2 +-
 tftp/Makefile.am              |    2 +-
 tftp/extern.h                 |    3 ++-
 tftp/main.c                   |    3 ++-
 tftp/tftp.c                   |    3 ++-
 tftpd/Makefile.am             |    2 +-
 tftpd/tftpd.c                 |    3 ++-
 traceroute/Makefile.am        |    2 +-
 traceroute/traceroute.c       |    2 +-
 uucpd/Makefile.am             |    2 +-
 uucpd/uucpd.c                 |    2 +-
 whois/Makefile.am             |    2 +-
 whois/data.h                  |    2 +-
 whois/whois.c                 |    2 +-
 whois/whois.h                 |    2 +-
 230 files changed, 400 insertions(+), 285 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Fri Jan 08 05:07:04 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NTBkG-0008VN-Cj
	for mharc-commit-inetutils@gnu.org; Fri, 08 Jan 2010 05:07:04 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NTBkF-0008Us-D4
	for commit-inetutils@gnu.org; Fri, 08 Jan 2010 05:07:03 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NTBkD-0008UX-OL
	for commit-inetutils@gnu.org; Fri, 08 Jan 2010 05:07:02 -0500
Received: from [199.232.76.173] (port=58744 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NTBkD-0008UU-KM
	for commit-inetutils@gnu.org; Fri, 08 Jan 2010 05:07:01 -0500
Received: from savannah.gnu.org ([199.232.41.3]:54246 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <simon@josefsson.org>) id 1NTBkC-0004MJ-Rk
	for commit-inetutils@gnu.org; Fri, 08 Jan 2010 05:07:01 -0500
Received: from [10.1.0.108] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <simon@josefsson.org>) id 1NTBkB-0002sE-KB
	for commit-inetutils@gnu.org; Fri, 08 Jan 2010 10:06:59 +0000
Received: from jas by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1NTBkB-0000Rr-J9
	for commit-inetutils@gnu.org; Fri, 08 Jan 2010 10:06:59 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c583418f78ee98caa2cb802cd9c1d703b3280689
X-Git-Newrev: 60bba401d8998bf3b2cb75e6aca7d7fdd81cdab2
Message-Id: <E1NTBkB-0000Rr-J9@cvs.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 08 Jan 2010 10:06:59 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_7-18-g60bba40
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jan 2010 10:07:03 -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  60bba401d8998bf3b2cb75e6aca7d7fdd81cdab2 (commit)
      from  c583418f78ee98caa2cb802cd9c1d703b3280689 (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=60bba401d8998bf3b2cb75e6aca7d7fdd81cdab2


commit 60bba401d8998bf3b2cb75e6aca7d7fdd81cdab2
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Jan 8 11:06:56 2010 +0100

    README-alpha: Explain more.

diff --git a/ChangeLog b/ChangeLog
index 86688ef..6291244 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-08  Simon Josefsson  <simon@josefsson.org>
+
+	* README-alpha: Explain more.
+
 2009-12-28  Alfred M. Szmidt  <ams@gnu.org>
 
 	* man/.gitignore: Added `*.8' to list.
diff --git a/README-alpha b/README-alpha
index a158e2c..31191c5 100644
--- a/README-alpha
+++ b/README-alpha
@@ -78,6 +78,10 @@ sources reside.
 
 For more information about `bootstrap', run `bootstrap --help'.
 
+Before running "make dist" in a freshly bootstrapped directory, you
+need to have run "make" at least once to create the binaries which are
+needed by help2man when generating man pages.
+
 See INSTALL and README for the detailed instructions.
 
 * Development

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

Summary of changes:
 ChangeLog    |    4 ++++
 README-alpha |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Tue Jan 12 16:47:55 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NUoah-0000c6-FO
	for mharc-commit-inetutils@gnu.org; Tue, 12 Jan 2010 16:47:55 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NUoaf-0000Zx-TG
	for commit-inetutils@gnu.org; Tue, 12 Jan 2010 16:47:53 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NUoab-0000T2-3r
	for commit-inetutils@gnu.org; Tue, 12 Jan 2010 16:47:53 -0500
Received: from [199.232.76.173] (port=36999 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NUoaa-0000Su-Rk
	for commit-inetutils@gnu.org; Tue, 12 Jan 2010 16:47:48 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:33614
	helo=internal.in.savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <ams@gnu.org>) id 1NUoaa-0000Vm-Ey
	for commit-inetutils@gnu.org; Tue, 12 Jan 2010 16:47:48 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal with esmtp (Exim 4.69) (envelope-from <ams@gnu.org>)
	id 1NUoaZ-0005SQ-VV
	for commit-inetutils@gnu.org; Tue, 12 Jan 2010 21:47:47 +0000
Received: from ams by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <ams@savannah.gnu.org>) id 1NUoaZ-0003qG-TB
	for commit-inetutils@gnu.org; Tue, 12 Jan 2010 21:47:47 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 60bba401d8998bf3b2cb75e6aca7d7fdd81cdab2
X-Git-Newrev: c3687e644ff20c7e62f0f235c0efca039c0312b9
Message-Id: <E1NUoaZ-0003qG-TB@vcs-noshell.in.savannah.gnu.org>
From: "Alfred M. Szmidt" <ams@gnu.org>
Date: Tue, 12 Jan 2010 21:47:47 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_7-19-gc3687e6
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jan 2010 21:47:54 -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  c3687e644ff20c7e62f0f235c0efca039c0312b9 (commit)
      from  60bba401d8998bf3b2cb75e6aca7d7fdd81cdab2 (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=c3687e644ff20c7e62f0f235c0efca039c0312b9


commit c3687e644ff20c7e62f0f235c0efca039c0312b9
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Jan 12 07:44:17 2010 +0100

    Updated.  (silent change)

diff --git a/TODO b/TODO
index 472a73b..da569fd 100644
--- a/TODO
+++ b/TODO
@@ -12,10 +12,10 @@ Function for parsing [USER@]HOSTNAME[:PORT], that returns each value
 in a structure.  Handle IP (v4 and v6) numbers as well.  And make
 programs use it.
 
-Files without a copyright notice: ChangeLog, ChangeLog.0, README,
-README-hacking, THANKS, TODO, confpaths.h.in, ifconfig/COMPATIBILITY,
-whois/as_del_list, whois/ip_del_list, whois/make_as_del.pl,
-whois/make_ip_del.pl, whois/make_tld_serv.pl, and whois/tld_serv_list.
+Files without a copyright notice: README, README-hacking, THANKS,
+TODO, confpaths.h.in, ifconfig/COMPATIBILITY, whois/as_del_list,
+whois/ip_del_list, whois/make_as_del.pl, whois/make_ip_del.pl,
+whois/make_tld_serv.pl, and whois/tld_serv_list.
 
 tftp does not work with IPv6.
 

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

Summary of changes:
 TODO |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Tue Jan 12 17:13:34 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NUozW-0005kf-Dn
	for mharc-commit-inetutils@gnu.org; Tue, 12 Jan 2010 17:13:34 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NUozT-0005ik-V3
	for commit-inetutils@gnu.org; Tue, 12 Jan 2010 17:13:32 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NUozO-0005ek-SK
	for commit-inetutils@gnu.org; Tue, 12 Jan 2010 17:13:31 -0500
Received: from [199.232.76.173] (port=53129 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NUozO-0005eW-EN
	for commit-inetutils@gnu.org; Tue, 12 Jan 2010 17:13:26 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:48350
	helo=internal.in.savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <ams@gnu.org>) id 1NUozM-0007aG-PQ
	for commit-inetutils@gnu.org; Tue, 12 Jan 2010 17:13:26 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal with esmtp (Exim 4.69) (envelope-from <ams@gnu.org>)
	id 1NUozL-0005mC-VW
	for commit-inetutils@gnu.org; Tue, 12 Jan 2010 22:13:23 +0000
Received: from ams by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <ams@savannah.gnu.org>) id 1NUozL-000542-My
	for commit-inetutils@gnu.org; Tue, 12 Jan 2010 22:13:23 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c3687e644ff20c7e62f0f235c0efca039c0312b9
X-Git-Newrev: c705eebed68fbc17382ab15e6c16a9de47bc510e
Message-Id: <E1NUozL-000542-My@vcs-noshell.in.savannah.gnu.org>
From: "Alfred M. Szmidt" <ams@gnu.org>
Date: Tue, 12 Jan 2010 22:13:23 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_7-22-gc705eeb
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jan 2010 22:13:32 -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  c705eebed68fbc17382ab15e6c16a9de47bc510e (commit)
       via  95ea74e024592d3850eaeb0f06d987c2fb0e95c2 (commit)
       via  ce4a6a972b0884dc0f40777c5ac22e3b99de14a1 (commit)
      from  c3687e644ff20c7e62f0f235c0efca039c0312b9 (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=c705eebed68fbc17382ab15e6c16a9de47bc510e


commit c705eebed68fbc17382ab15e6c16a9de47bc510e
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Jan 12 23:19:32 2010 +0100

    Removed blank lines at EOF.  (silent change)

diff --git a/src/rexecd.c b/src/rexecd.c
index e2e014b..ab6000d 100644
--- a/src/rexecd.c
+++ b/src/rexecd.c
@@ -386,4 +386,3 @@ getstr (const char *err)
 
   return buf;
 }
-
diff --git a/src/rshd.c b/src/rshd.c
index 747e72b..6d25d6f 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -1265,4 +1265,3 @@ topdomain (const char *h)
     }
   return maybe;
 }
-

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


commit 95ea74e024592d3850eaeb0f06d987c2fb0e95c2
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Jan 12 23:18:27 2010 +0100

    Moved single file programs to src/.

diff --git a/ChangeLog b/ChangeLog
index c0ac290..bd44e95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,103 @@
 2010-01-12  Alfred M. Szmidt  <ams@gnu.org>
 
+	Moved single file programs to src/.
+
+	* libinetutils/Makefile.am (noinst_HEADERS): Added tftpsubs.h
+	shishi_def.h to list.
+	* libinetutils/Makefile.am (INCLUDES): Removed
+	-I$(top_srcdir)/headers from list.  Added
+	-I$(top_srcdir)/libinetutils to list.
+	* Makefile.am: File removed.
+	* headers/shishi_def.h: File renamed to ..
+	* libinetutils/shishi_def.h: ... this.
+	* headers/tftpsubs.h: File renamed to ...
+	* libinetutils/tftpsubs.h: ... this.
+
+	* src/.gitignore: New file.
+	* src/Makefile.am: New file.
+
+	* man/Makefile.am (hostname.1, inetd.8, logger.1, rcp.1, rexec.1)
+	(rexecd.8, rlogin.1, rlogind.8, rsh.1, rshd.8, syslogd.8, tftp.1)
+	(tftpd.8, traceroute.1, uucpd.8): Look for main program file in
+	src/.
+	(mapped_name): Added rewrite rules for hostname, inetd, logger,
+	rcp, rexec, rexecd, rlogin, rlogind, rsh, rshd, syslogd, tftp,
+	tftpd, traceroute, and uucpd.
+	* configure.ac (AC_CONFIG_SRCDIR): Look for src/inetd.c.
+	(AC_CONFIG_FILES): Removed hostname/Makefile, inetd/Makefile,
+	logger/Makefile, rcp/Makefile, rexec/Makefile, rexecd/Makefile,
+	rlogin/Makefile, rlogind/Makefile, rsh/Makefile, rshd/Makefile,
+	syslogd/Makefile, tftp/Makefile, tftpd/Makefile,
+	traceroute/Makefile, and uucpd/Makefile from list.  Added
+	src/Makefile to list.  Sorted list (in the order: libraries,
+	programs, documentation, tests, misc.).
+	* Makefile.am (SUBDIRS): Removed hostname, inetd, logger, rcp,
+	rexec, rexecd, rlogin, rlogind, rsh, rshd, syslogd, tftp, tftpd,
+	traceroute, and uucpd from list.  Added src to list.  Sorted
+	list (in the order: libraries, programs, documentation, tests).
+
+	* hostname/.gitignore, hostname/Makefile.am: Files removed.
+	* hostname/hostname.c: File renamed to ...
+	* src/hostname.c: ... this.
+
+	* inetd/.gitignore, inetd/Makefile.am: Files removed.
+	* inetd/inetd.c: File renamed to ...
+	* src/inetd.c: ... this.
+
+	* logger/.gitignore, logger/Makefile.am: Files removed.
+	* logger/logger.c: File renamed to ...
+	* src/logger.c: ... this.
+
+	* rcp/.gitignore, rcp/Makefile.am: Files removed.
+	* rcp/rcp.c: File renamed to ...
+	* src/rcp.c: ... this.
+
+	* rexec/.gitignore, rexec/Makefile.am: Files removed.
+	* rexec/rexec.c: File renamed to ...
+	* src/rexec.c: ... this.
+
+	* rexecd/.gitignore, rexecd/Makefile.am: Files removed.
+	* rexecd/rexecd.c: File renamed to ...
+	* src/rexecd.c: ... this.
+
+	* rlogin/.gitignore, rlogin/Makefile.am: Files removed.
+	* rlogin/rlogin.c: File renamed to ...
+	* src/rlogin.c: ... this.
+
+	* rlogind/.gitignore, rlogind/Makefile.am: Files removed.
+	* rlogind/rlogind.c: File renamed to ...
+	* src/rlogind.c: ... this.
+
+	* rsh/.gitignore, rsh/Makefile.am: Files removed.
+	* rsh/rsh.c: File renamed to ...
+	* src/rsh.c: ... this.
+
+	* rshd/.gitignore, rshd/Makefile.am: Files removed.
+	* rshd/rshd.c: File renamed to ...
+	* src/rshd.c: ... this.
+
+	* syslogd/.gitignore, syslogd/Makefile.am: Files removed.
+	* syslogd/syslogd.c: File renamed to ...
+	* src/syslogd.c: ... this.
+
+	* tftp/.gitignore, tftp/Makefile.am: Files removed.
+	* tftp/tftp.c: File renamed to ...
+	* src/tftp.c: ... this.
+
+	* tftpd/.gitignore, tftpd/Makefile.am: Files removed.
+	* tftpd/tftpd.c: File renamed to ...
+	* src/tftpd.c: ... this.
+
+	* traceroute/.gitignore, traceroute/Makefile.am: Files removed.
+	* traceroute/traceroute.c: File renamed to ...
+	* src/traceroute.c: ... this.
+
+	* uucpd/.gitignore, uucpd/Makefile.am: Files removed.
+	* uucpd/uucpd.c: File renamed to ...
+	* src/uucpd.c: ... this.
+
+2010-01-12  Alfred M. Szmidt  <ams@gnu.org>
+
 	Merged tftp/extern.h and tftp/main.c into tftp/tftp.c.
 
 	* tftp/Makefile.am (tftp_SOURCES): Removed main.c from list.
diff --git a/Makefile.am b/Makefile.am
index 5e81999..4b41a6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,10 +23,11 @@ ACLOCAL_AMFLAGS = -I m4 -I am
 
 EXTRA_DIST = README-alpha paths ChangeLog.0
 
-SUBDIRS = lib headers libinetutils libtelnet \
-	hostname inetd telnetd libls ftpd rshd rlogind uucpd rexecd syslogd \
-	tftpd talkd telnet ftp rsh rcp rlogin tftp logger whois talk \
-	libicmp ping doc ifconfig traceroute rexec tests man
+SUBDIRS = lib \
+	libinetutils libtelnet libicmp libls \
+	src telnet telnetd ftp ftpd talk talkd whois ping ifconfig \
+	doc man \
+	tests
 
 DISTCLEANFILES = pathdefs.make paths.defs
 
diff --git a/configure.ac b/configure.ac
index 61fdc49..cfb8ef1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_PREREQ(2.59)
 
 AC_INIT([GNU inetutils], [1.7.90], [bug-inetutils@gnu.org])
 
-AC_CONFIG_SRCDIR([inetd/inetd.c])
+AC_CONFIG_SRCDIR([src/inetd.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_CONFIG_HEADER([config.h:config.hin])
 AC_CANONICAL_SYSTEM # FIXME: Why not just _HOST?
@@ -812,40 +812,25 @@ esac
 
 AC_CONFIG_FILES([
 Makefile
+lib/Makefile
 libinetutils/Makefile 
 libtelnet/Makefile
 libicmp/Makefile
-ping/Makefile
+libls/Makefile
+src/Makefile
+telnet/Makefile
+telnetd/Makefile
 ftp/Makefile
 ftpd/Makefile
-hostname/Makefile
-inetd/Makefile
-rcp/Makefile
-rexec/Makefile
-rexecd/Makefile
-rlogin/Makefile
-rlogind/Makefile
-rsh/Makefile
-rshd/Makefile
-logger/Makefile
-syslogd/Makefile
 talk/Makefile
 talkd/Makefile
-telnet/Makefile
-telnetd/Makefile
-tftp/Makefile
-tftpd/Makefile
-uucpd/Makefile
 whois/Makefile
-lib/Makefile
-libls/Makefile
+ping/Makefile
 ifconfig/Makefile
 ifconfig/system/Makefile
-traceroute/Makefile
-confpaths.h:confpaths.h.in
-headers/Makefile
 doc/Makefile
-tests/Makefile
 man/Makefile
+tests/Makefile
+confpaths.h:confpaths.h.in
 ])
 AC_OUTPUT
diff --git a/headers/Makefile.am b/headers/Makefile.am
deleted file mode 100644
index 4ee15aa..0000000
--- a/headers/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-noinst_HEADERS = tftpsubs.h shishi_def.h
diff --git a/hostname/.gitignore b/hostname/.gitignore
deleted file mode 100644
index ecd88ae..0000000
--- a/hostname/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-hostname
diff --git a/hostname/Makefile.am b/hostname/Makefile.am
deleted file mode 100644
index b34c251..0000000
--- a/hostname/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-bin_PROGRAMS = @hostname_BUILD@
-
-EXTRA_PROGRAMS = hostname
-
-hostname_SOURCES = hostname.c
-
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/libinetutils
-
-LDADD = -L$(top_builddir)/lib ../lib/libgnu.a
diff --git a/inetd/.gitignore b/inetd/.gitignore
deleted file mode 100644
index 4c730e4..0000000
--- a/inetd/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-inetd
-
diff --git a/inetd/Makefile.am b/inetd/Makefile.am
deleted file mode 100644
index d5f6a54..0000000
--- a/inetd/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-inetdaemondir = @inetdaemondir@
-
-inetdaemon_PROGRAMS = @inetd_BUILD@
-
-EXTRA_PROGRAMS = inetd
-
-inetd_SOURCES = inetd.c
-
-@PATHDEFS_MAKE@
-
-INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils
-AM_CPPFLAGS = $(PATHDEF_INETDCONF) $(PATHDEF_INETDDIR) \
-           $(PATHDEF_INETDPID)
-
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a
diff --git a/libinetutils/Makefile.am b/libinetutils/Makefile.am
index a45b859..07e0566 100644
--- a/libinetutils/Makefile.am
+++ b/libinetutils/Makefile.am
@@ -19,7 +19,7 @@
 
 noinst_LIBRARIES = libinetutils.a
 
-noinst_HEADERS = argcv.h libinetutils.h
+noinst_HEADERS = argcv.h libinetutils.h tftpsubs.h shishi_def.h
 
 EXTRA_DIST = logwtmp.c
 
@@ -46,4 +46,4 @@ libinetutils_a_LIBADD = daemon.o $(top_builddir)/lib/libgnu.a
 
 AM_CPPFLAGS = $(PATHDEF_WTMPX) $(PATHDEF_TTY_PFX) $(PATHDEF_DEVNULL) $(PATHDEF_HEQUIV) 
 
-INCLUDES = -I$(top_srcdir)/headers -I$(top_srcdir)/lib -I../lib
+INCLUDES = -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib -I../lib
diff --git a/headers/shishi_def.h b/libinetutils/shishi_def.h
similarity index 100%
rename from headers/shishi_def.h
rename to libinetutils/shishi_def.h
diff --git a/headers/tftpsubs.h b/libinetutils/tftpsubs.h
similarity index 100%
rename from headers/tftpsubs.h
rename to libinetutils/tftpsubs.h
diff --git a/logger/.gitignore b/logger/.gitignore
deleted file mode 100644
index ff0edb1..0000000
--- a/logger/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-logger
-
diff --git a/logger/Makefile.am b/logger/Makefile.am
deleted file mode 100644
index 8466354..0000000
--- a/logger/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-bin_PROGRAMS = @logger_BUILD@
-
-INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a
-
-EXTRA_PROGRAMS = logger
-
-logger_SOURCES = logger.c
diff --git a/man/Makefile.am b/man/Makefile.am
index 0be8462..2b0e189 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -131,33 +131,33 @@ ftp.1: ftp.h2m $(top_srcdir)/ftp/main.c $(top_srcdir)/configure.ac
 
 ftpd.8: ftpd.h2m $(top_srcdir)/ftpd/ftpd.c $(top_srcdir)/configure.ac
 
-hostname.1: hostname.h2m $(top_srcdir)/hostname/hostname.c $(top_srcdir)/configure.ac
+hostname.1: hostname.h2m $(top_srcdir)/src/hostname.c $(top_srcdir)/configure.ac
 
 ifconfig.1: ifconfig.h2m $(top_srcdir)/ifconfig/options.c $(top_srcdir)/configure.ac
 
-inetd.8: inetd.h2m $(top_srcdir)/inetd/inetd.c $(top_srcdir)/configure.ac
+inetd.8: inetd.h2m $(top_srcdir)/src/inetd.c $(top_srcdir)/configure.ac
 
-logger.1: logger.h2m $(top_srcdir)/logger/logger.c $(top_srcdir)/configure.ac
+logger.1: logger.h2m $(top_srcdir)/src/logger.c $(top_srcdir)/configure.ac
 
 ping.1: ping.h2m $(top_srcdir)/ping/ping.c $(top_srcdir)/configure.ac
 
 ping6.1: ping6.h2m $(top_srcdir)/ping/ping6.c $(top_srcdir)/configure.ac
 
-rcp.1: rcp.h2m $(top_srcdir)/rcp/rcp.c $(top_srcdir)/configure.ac
+rcp.1: rcp.h2m $(top_srcdir)/src/rcp.c $(top_srcdir)/configure.ac
 
-rexec.1: rexec.h2m $(top_srcdir)/rexec/rexec.c $(top_srcdir)/configure.ac
+rexec.1: rexec.h2m $(top_srcdir)/src/rexec.c $(top_srcdir)/configure.ac
 
-rexecd.8: rexecd.h2m $(top_srcdir)/rexecd/rexecd.c $(top_srcdir)/configure.ac
+rexecd.8: rexecd.h2m $(top_srcdir)/src/rexecd.c $(top_srcdir)/configure.ac
 
-rlogin.1: rlogin.h2m $(top_srcdir)/rlogin/rlogin.c $(top_srcdir)/configure.ac
+rlogin.1: rlogin.h2m $(top_srcdir)/src/rlogin.c $(top_srcdir)/configure.ac
 
-rlogind.8: rlogind.h2m $(top_srcdir)/rlogind/rlogind.c $(top_srcdir)/configure.ac
+rlogind.8: rlogind.h2m $(top_srcdir)/src/rlogind.c $(top_srcdir)/configure.ac
 
-rsh.1: rsh.h2m $(top_srcdir)/rsh/rsh.c $(top_srcdir)/configure.ac
+rsh.1: rsh.h2m $(top_srcdir)/src/rsh.c $(top_srcdir)/configure.ac
 
-rshd.8: rshd.h2m $(top_srcdir)/rshd/rshd.c $(top_srcdir)/configure.ac
+rshd.8: rshd.h2m $(top_srcdir)/src/rshd.c $(top_srcdir)/configure.ac
 
-syslogd.8: syslogd.h2m $(top_srcdir)/syslogd/syslogd.c $(top_srcdir)/configure.ac
+syslogd.8: syslogd.h2m $(top_srcdir)/src/syslogd.c $(top_srcdir)/configure.ac
 
 talk.1: talk.h2m $(top_srcdir)/talk/talk.c $(top_srcdir)/configure.ac
 
@@ -167,13 +167,13 @@ telnet.1: telnet.h2m $(top_srcdir)/telnet/main.c $(top_srcdir)/configure.ac
 
 telnetd.8: telnetd.h2m $(top_srcdir)/telnetd/telnetd.c $(top_srcdir)/configure.ac
 
-tftp.1: tftp.h2m $(top_srcdir)/tftp/main.c $(top_srcdir)/configure.ac
+tftp.1: tftp.h2m $(top_srcdir)/src/tftp.c $(top_srcdir)/configure.ac
 
-tftpd.8: tftpd.h2m $(top_srcdir)/tftpd/tftpd.c $(top_srcdir)/configure.ac
+tftpd.8: tftpd.h2m $(top_srcdir)/src/tftpd.c $(top_srcdir)/configure.ac
 
-traceroute.1: traceroute.h2m $(top_srcdir)/traceroute/traceroute.c $(top_srcdir)/configure.ac
+traceroute.1: traceroute.h2m $(top_srcdir)/src/traceroute.c $(top_srcdir)/configure.ac
 
-uucpd.8: uucpd.h2m $(top_srcdir)/uucpd/uucpd.c $(top_srcdir)/configure.ac
+uucpd.8: uucpd.h2m $(top_srcdir)/src/uucpd.c $(top_srcdir)/configure.ac
 
 whois.1: whois.h2m $(top_srcdir)/whois/whois.c $(top_srcdir)/configure.ac
 
@@ -183,7 +183,23 @@ whois.1: whois.h2m $(top_srcdir)/whois/whois.c $(top_srcdir)/configure.ac
 .h2m.8:
 	make man TOOL=$* SECTION=8
 
-mapped_name = `echo ../$(TOOL)/$(TOOL) | sed s,../ping6/ping6,../ping/ping6,`
+mapped_name = `echo ../$(TOOL)/$(TOOL) \
+| sed s,../ping6/ping6,../ping/ping6,\
+| sed s,../hostname/hostname,../src/hostname,\
+| sed s,../inetd/inetd,../src/inetd,\
+| sed s,../logger/logger,../src/logger,\
+| sed s,../rcp/rcp,../src/rcp,\
+| sed s,../rexec/rexec,../src/rexec,\
+| sed s,../rexecd/rexecd,../src/rexecd,\
+| sed s,../rlogin/rlogin,../src/rlogin,\
+| sed s,../rlogind/rlogind,../src/rlogind,\
+| sed s,../rsh/rsh,../src/rsh,\
+| sed s,../rshd/rshd,../src/rshd,\
+| sed s,../syslogd/syslogd,../src/syslogd,\
+| sed s,../tftp/tftp,../src/tftp,\
+| sed s,../tftpd/tftpd,../src/tftpd,\
+| sed s,../traceroute/traceroute,../src/traceroute,\
+| sed s,../uucpd/uucpd,../src/uucpd,`
 
 .PHONY: man
 man:
diff --git a/rcp/.gitignore b/rcp/.gitignore
deleted file mode 100644
index bcd4589..0000000
--- a/rcp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-rcp
diff --git a/rcp/Makefile.am b/rcp/Makefile.am
deleted file mode 100644
index 9bb37cd..0000000
--- a/rcp/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-bin_PROGRAMS = @rcp_BUILD@
-
-EXTRA_PROGRAMS = rcp
-
-rcp_SOURCES = rcp.c
-
-@PATHDEFS_MAKE@
-
-AM_CPPFLAGS = $(PATHDEF_RSH) $(PATHDEF_CP) $(PATHDEF_BSHELL)
-INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils
-
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a \
-         $(LIBUTIL) @LIBCRYPT@ @LIBAUTH@
-
-SUIDMODE = -o root -m 4775
-
-install-rcp-hook:
-	-@$(INSTALL_PROGRAM) $(bin_PROGRAMS) $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo $(bin_PROGRAMS)|sed '$(transform)'` ; \
-	if test $$? -ne 0; then \
-		echo 'INSTALL-ERROR:'; \
-		echo 'INSTALL-ERROR: THIS PROGRAM($(bin_PROGRAMS)) MUST BE INSTALLED SETUID ROOT'; \
-		echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) $(bin_PROGRAMS) $(SUIDMODE) $(DESTDIR)$(bindir)/$(bin_PROGRAMS)'; \
-		echo 'INSTALL-ERROR:'; \
-	fi
-
-install-exec-hook: @rcp_INSTALL_HOOK@
-
diff --git a/rexec/.gitignore b/rexec/.gitignore
deleted file mode 100644
index 86ca246..0000000
--- a/rexec/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-rexec
diff --git a/rexec/Makefile.am b/rexec/Makefile.am
deleted file mode 100644
index 3e10273..0000000
--- a/rexec/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-bin_PROGRAMS = @rexec_BUILD@
-
-EXTRA_PROGRAMS = rexec
-
-rexec_SOURCES = rexec.c
-
-noinst_HEADERS = 
-
-@PATHDEFS_MAKE@
-
-INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils
-AM_CPPFLAGS = $(PATHDEF_DEFPATH) $(PATHDEF_BSHELL)
-
-LIBCRYPT = @LIBCRYPT@
-
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a $(LIBCRYPT)
diff --git a/rexecd/.gitignore b/rexecd/.gitignore
deleted file mode 100644
index 506012f..0000000
--- a/rexecd/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-rexecd
diff --git a/rexecd/Makefile.am b/rexecd/Makefile.am
deleted file mode 100644
index 6365ea4..0000000
--- a/rexecd/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-inetdaemondir = @inetdaemondir@
-
-inetdaemon_PROGRAMS = @rexecd_BUILD@
-
-EXTRA_PROGRAMS = rexecd
-
-rexecd_SOURCES = rexecd.c
-
-@PATHDEFS_MAKE@
-
-AM_CPPFLAGS = $(PATHDEF_DEFPATH) $(PATHDEF_BSHELL)
-INCLUDES=-I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils
-
-LIBCRYPT = @LIBCRYPT@
-
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a $(LIBCRYPT)
diff --git a/rlogin/.gitignore b/rlogin/.gitignore
deleted file mode 100644
index adb6904..0000000
--- a/rlogin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-rlogin
diff --git a/rlogin/Makefile.am b/rlogin/Makefile.am
deleted file mode 100644
index 1703877..0000000
--- a/rlogin/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-bin_PROGRAMS = @rlogin_BUILD@
-
-EXTRA_PROGRAMS = rlogin
-
-rlogin_SOURCES = rlogin.c
-
-INCLUDES = -I$(top_srcdir)/headers -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a $(LIBUTIL) @LIBCRYPT@ @LIBAUTH@
-
-SUIDMODE = -o root -m 4775
-
-install-rlogin-hook:
-	-@$(INSTALL_PROGRAM) $(bin_PROGRAMS) $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo $(bin_PROGRAMS)|sed '$(transform)'` ; \
-	if test $$? -ne 0; then \
-		echo 'INSTALL-ERROR:'; \
-		echo 'INSTALL-ERROR: THIS PROGRAM($(bin_PROGRAMS)) MUST BE INSTALLED SETUID ROOT'; \
-		echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) $(bin_PROGRAMS) $(SUIDMODE) $(DESTDIR)$(bindir)/$(bin_PROGRAMS)'; \
-		echo 'INSTALL-ERROR:'; \
-	fi
-
-install-exec-hook: @rlogin_INSTALL_HOOK@
-
-
diff --git a/rlogind/.gitignore b/rlogind/.gitignore
deleted file mode 100644
index 0c675f9..0000000
--- a/rlogind/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-rlogind
diff --git a/rlogind/Makefile.am b/rlogind/Makefile.am
deleted file mode 100644
index 498c1bc..0000000
--- a/rlogind/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-inetdaemondir = @inetdaemondir@
-
-inetdaemon_PROGRAMS = @rlogind_BUILD@
-
-EXTRA_PROGRAMS = rlogind
-
-rlogind_SOURCES = rlogind.c
-
-@PATHDEFS_MAKE@
-
-INCLUDES = -I$(top_srcdir)/headers -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib -I../lib 
-
-AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_LOGIN)
-
-LIBUTIL = @LIBUTIL@
-
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a $(LIBUTIL) @LIBCRYPT@ @LIBAUTH@
diff --git a/rsh/.gitignore b/rsh/.gitignore
deleted file mode 100644
index 4e063ef..0000000
--- a/rsh/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-rsh
diff --git a/rsh/Makefile.am b/rsh/Makefile.am
deleted file mode 100644
index f1ede38..0000000
--- a/rsh/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-bin_PROGRAMS = @rsh_BUILD@
-
-EXTRA_PROGRAMS = rsh
-
-rsh_SOURCES = rsh.c
-
-@PATHDEFS_MAKE@
-
-AM_CPPFLAGS = $(PATHDEF_RLOGIN)
-INCLUDES = -I$(top_srcdir)/headers -I$(top_srcdir)/lib -I../lib  -I$(top_srcdir)/libinetutils
-
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a \
-         $(LIBUTIL) @LIBCRYPT@ @LIBAUTH@
-
-SUIDMODE = -o root -m 4775
-
-install-rsh-hook:
-	-@$(INSTALL_PROGRAM) $(bin_PROGRAMS) $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo $(bin_PROGRAMS)|sed '$(transform)'` ; \
-	if test $$? -ne 0; then \
-		echo 'INSTALL-ERROR:'; \
-		echo 'INSTALL-ERROR: THIS PROGRAM($(bin_PROGRAMS)) MUST BE INSTALLED SETUID ROOT'; \
-		echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) $(bin_PROGRAMS) $(SUIDMODE) $(DESTDIR)$(bindir)/$(bin_PROGRAMS)'; \
-		echo 'INSTALL-ERROR:'; \
-	fi
-
-install-exec-hook: @rsh_INSTALL_HOOK@
-
diff --git a/rshd/.gitignore b/rshd/.gitignore
deleted file mode 100644
index 0c8f0c6..0000000
--- a/rshd/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-rshd
diff --git a/rshd/Makefile.am b/rshd/Makefile.am
deleted file mode 100644
index bec2948..0000000
--- a/rshd/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-inetdaemondir = @inetdaemondir@
-
-inetdaemon_PROGRAMS = @rshd_BUILD@
-
-EXTRA_PROGRAMS = rshd
-
-rshd_SOURCES = rshd.c
-
-@PATHDEFS_MAKE@
-
-AM_CPPFLAGS = $(PATHDEF_BSHELL) $(PATHDEF_NOLOGIN) $(PATHDEF_DEFPATH)
-INCLUDES = -I$(top_srcdir)/headers -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib -I../lib 
-
-LDADD = -L../libinetutils -linetutils  ../lib/libgnu.a \
-        $(LIBUTIL) @LIBCRYPT@ @LIBAUTH@
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..a41cd45
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,15 @@
+hostname
+inetd
+logger
+rcp
+rexec
+rexecd
+rlogin
+rlogind
+rsh
+rshd
+syslogd
+tftp
+tftpd
+traceroute
+uucpd
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..c77e63d
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,139 @@
+#
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#
+# This file is part of GNU Inetutils.
+#
+# GNU Inetutils is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# GNU Inetutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+inetdaemondir = @inetdaemondir@
+
+# Initialise variables.
+inetdaemon_PROGRAMS =
+bin_PROGRAMS =
+EXTRA_PROGRAMS =
+
+
+bin_PROGRAMS += @hostname_BUILD@
+hostname_SOURCES = hostname.c
+EXTRA_PROGRAMS += hostname
+
+bin_PROGRAMS += @logger_BUILD@
+logger_SOURCES = logger.c
+EXTRA_PROGRAMS += logger
+
+bin_PROGRAMS += @rcp_BUILD@
+rcp_SOURCES = rcp.c
+EXTRA_PROGRAMS += rcp
+
+bin_PROGRAMS += @rexec_BUILD@
+rexec_SOURCES = rexec.c
+EXTRA_PROGRAMS += rexec
+
+bin_PROGRAMS += @rlogin_BUILD@
+rlogin_SOURCES = rlogin.c
+EXTRA_PROGRAMS += rlogin
+
+bin_PROGRAMS += @rsh_BUILD@
+rsh_SOURCES = rsh.c
+EXTRA_PROGRAMS += rsh
+
+bin_PROGRAMS += @tftp_BUILD@
+tftp_SOURCES = tftp.c
+EXTRA_PROGRAMS += tftp
+
+bin_PROGRAMS += @traceroute_BUILD@
+traceroute_SOURCES = traceroute.c
+EXTRA_PROGRAMS += traceroute
+
+inetdaemon_PROGRAMS += @inetd_BUILD@
+inetd_SOURCES = inetd.c
+EXTRA_PROGRAMS += inetd
+
+inetdaemon_PROGRAMS += @rexecd_BUILD@
+rexecd_SOURCES = rexecd.c
+EXTRA_PROGRAMS += rexecd
+
+inetdaemon_PROGRAMS += @rlogind_BUILD@
+rlogind_SOURCES = rlogind.c
+EXTRA_PROGRAMS += rlogind
+
+inetdaemon_PROGRAMS += @rshd_BUILD@
+rshd_SOURCES = rshd.c
+EXTRA_PROGRAMS += rshd
+
+inetdaemon_PROGRAMS += @syslogd_BUILD@
+syslogd_SOURCES = syslogd.c
+EXTRA_PROGRAMS += syslogd
+
+inetdaemon_PROGRAMS += @tftpd_BUILD@
+tftpd_SOURCES = tftpd.c
+EXTRA_PROGRAMS += tftpd
+
+inetdaemon_PROGRAMS += @uucpd_BUILD@
+uucpd_SOURCES = uucpd.c
+EXTRA_PROGRAMS += uucpd
+
+INCLUDES = -I$(top_srcdir)/lib \
+	-I$(top_srcdir)/libinetutils \
+	-I$(top_srcdir)/libicmp
+
+LDADD = -L$(top_builddir)/libicmp -licmp \
+	-L$(top_builddir)/libinetutils -linetutils \
+	-L$(top_builddir)/lib ../lib/libgnu.a \
+	@LIBAUTH@ @LIBCRYPT@ @LIBUTIL@
+
+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_LOGIN) $(PATHDEF_LOGPID) $(PATHDEF_NOLOGIN) $(PATHDEF_RLOGIN) $(PATHDEF_RSH) $(PATHDEF_TTY) $(PATHDEF_UTMP) $(PATHDEF_UUCICO)
+
+SUIDMODE = -o root -m 4775
+
+install-exec-hook: @traceroute_INSTALL_HOOK@ @rsh_INSTALL_HOOK@ @rlogin_INSTALL_HOOK@ @rcp_INSTALL_HOOK@
+
+install-traceroute-hook:
+	-@$(INSTALL_PROGRAM) traceroute $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo traceroute|sed '$(transform)'` ; \
+	if test $$? -ne 0; then \
+		echo 'INSTALL-ERROR:'; \
+		echo 'INSTALL-ERROR: THIS PROGRAM(traceroute) MUST BE INSTALLED SETUID ROOT'; \
+		echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) 'traceroute' $(SUIDMODE) $(DESTDIR)$(bindir)/'traceroute; \
+		echo 'INSTALL-ERROR:'; \
+	fi
+
+install-rsh-hook:
+	-@$(INSTALL_PROGRAM) rsh $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo rsh|sed '$(transform)'` ; \
+	if test $$? -ne 0; then \
+		echo 'INSTALL-ERROR:'; \
+		echo 'INSTALL-ERROR: THIS PROGRAM(rsh) MUST BE INSTdALLED SETUID ROOT'; \
+		echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) rsh $(SUIDMODE) $(DESTDIR)$(bindir)/rsh'; \
+		echo 'INSTALL-ERROR:'; \
+	fi
+
+install-rlogin-hook:
+	-@$(INSTALL_PROGRAM) rlogin $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo rlogin|sed '$(transform)'` ; \
+	if test $$? -ne 0; then \
+		echo 'INSTALL-ERROR:'; \
+		echo 'INSTALL-ERROR: THIS PROGRAM(rlogin) MUST BE INSTALLED SETUID ROOT'; \
+		echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) rlogin $(SUIDMODE) $(DESTDIR)$(bindir)/rlogin'; \
+		echo 'INSTALL-ERROR:'; \
+	fi
+
+install-rcp-hook:
+	-@$(INSTALL_PROGRAM) rcp $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo rcp|sed '$(transform)'` ; \
+	if test $$? -ne 0; then \
+		echo 'INSTALL-ERROR:'; \
+		echo 'INSTALL-ERROR: THIS PROGRAM(rcp) MUST BE INSTALLED SETUID ROOT'; \
+		echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) rcp $(SUIDMODE) $(DESTDIR)$(bindir)/rcp'; \
+		echo 'INSTALL-ERROR:'; \
+	fi
+
+@PATHDEFS_MAKE@
diff --git a/hostname/hostname.c b/src/hostname.c
similarity index 100%
rename from hostname/hostname.c
rename to src/hostname.c
diff --git a/inetd/inetd.c b/src/inetd.c
similarity index 99%
rename from inetd/inetd.c
rename to src/inetd.c
index ad735c1..72e232f 100644
--- a/inetd/inetd.c
+++ b/src/inetd.c
@@ -49,12 +49,12 @@
 
 /*
  * Inetd - Internet super-server
- *  
+ *
  * This program invokes all internet services as needed.  Connection-oriented
  * services are invoked each time a connection is made, by creating a process.
  * This process is passed the connection as file descriptor 0 and is expected
  * to do a getpeername to find out the source host and port.
- *  
+ *
  * Datagram oriented services are invoked when a datagram
  * arrives; a process is created and passed a pending message
  * on file descriptor 0.  Datagram servers may either connect
@@ -63,13 +63,13 @@
  * processing all arriving datagrams and, eventually, timing
  * out.	 The first type of server is said to be ``multi-threaded'';
  * the second type of server ``single-threaded''.
- *  
+ *
  * Inetd uses a configuration file which is read at startup
  * and, possibly, at some later time in response to a hangup signal.
  * The configuration file is ``free format'' with fields given in the
  * order shown below.  Continuation lines for an entry must being with
  * a space or tab.  All fields must be present in each entry.
- *  
+ *
  *	service name			must be in /etc/services or must
  *					name a tcpmux service
  *	socket type			stream/dgram/raw/rdm/seqpacket
@@ -79,7 +79,7 @@
  *	user				user to run daemon as
  *	server program			full path name
  *	server program arguments	arguments starting with argv[0]
- *  
+ *
  * TCP services without official port numbers are handled with the
  * RFC1078-based tcpmux internal service. Tcpmux listens on port 1 for
  * requests. When a connection is made from a foreign host, the service
@@ -94,7 +94,7 @@
  * special server code in them. Services that use tcpmux are "nowait"
  * because they do not have a well-known port and hence cannot listen
  * for new requests.
- *  
+ *
  * Comment lines are indicated by a `#' in column 1.
  */
 
@@ -333,7 +333,7 @@ struct biltin *
 bi_lookup (const struct servtab *sep)
 {
   struct biltin *bi;
-  
+
   for (bi = biltins; bi->bi_service; bi++)
     if (bi->bi_socktype == sep->se_socktype
 	&& strcmp (bi->bi_service, sep->se_service) == 0)
@@ -556,7 +556,7 @@ setup (struct servtab *sep)
 {
   int err;
   int on = 1;
-  
+
  tryagain:
   sep->se_fd = socket (sep->se_family, sep->se_socktype, 0);
   if (sep->se_fd < 0)
@@ -570,7 +570,7 @@ setup (struct servtab *sep)
 	  sep->se_family = AF_INET;
 	  goto tryagain;
 	}
-	  
+
       if (debug)
 	fprintf (stderr, "socket failed on %s/%s: %s\n",
 		 sep->se_service, sep->se_proto, strerror (errno));
@@ -590,19 +590,19 @@ setup (struct servtab *sep)
 		      (char *) &val, sizeof (val)) < 0)
 	syslog (LOG_ERR, "setsockopt (IPV6_V6ONLY): %m");
     }
-#endif      
+#endif
   if (strncmp (sep->se_proto, "tcp", 3) == 0 && (options & SO_DEBUG))
     {
       if (setsockopt (sep->se_fd, SOL_SOCKET, SO_DEBUG,
 		      (char *) &on, sizeof (on)) < 0)
 	syslog (LOG_ERR, "setsockopt (SO_DEBUG): %m");
     }
-  
+
   err = setsockopt (sep->se_fd, SOL_SOCKET, SO_REUSEADDR,
 		    (char *) &on, sizeof (on));
   if (err < 0)
     syslog (LOG_ERR, "setsockopt (SO_REUSEADDR): %m");
-      
+
   err = bind (sep->se_fd, (struct sockaddr *) &sep->se_ctrladdr,
 	      sizeof (sep->se_ctrladdr));
   if (err < 0)
@@ -637,7 +637,7 @@ setup (struct servtab *sep)
 {
   int err;
   const int on = 1;
-  
+
   sep->se_fd = socket (sep->se_family, sep->se_socktype, 0);
   if (sep->se_fd < 0)
     {
@@ -679,7 +679,7 @@ setup (struct servtab *sep)
       return 1;
     }
   return 0;
-}  
+}
 #endif
 
 void
@@ -738,7 +738,7 @@ enter (struct servtab *cp)
   struct servtab *sep;
   SIGSTATUS sigstatus;
   int i;
-    
+
   /* Checking/Removing duplicates */
   for (sep = servtab; sep; sep = sep->se_next)
     if (memcmp (&sep->se_ctrladdr, &cp->se_ctrladdr,
@@ -774,7 +774,7 @@ enter (struct servtab *cp)
 	print_service ("REDO", sep);
       return sep;
     }
-      
+
   if (debug)
     print_service ("ADD ", cp);
 
@@ -793,7 +793,7 @@ enter (struct servtab *cp)
   dupmem ((void**)&sep->se_argv, sep->se_argc * sizeof (sep->se_argv[0]));
   for (i = 0; i < sep->se_argc; i++)
     dupstr (&sep->se_argv[i]);
-  
+
   sep->se_fd = -1;
   signal_block (&sigstatus);
   sep->se_next = servtab;
@@ -829,7 +829,7 @@ expand_enter (struct servtab *sep)
   struct addrinfo *result, *rp;
   struct protoent *proto;
   struct servtab *cp;
-  
+
   /* Make sure that tcp6 etc also work.  */
   if (strncmp (sep->se_proto, "tcp", 3) == 0)
     proto = getprotobyname ("tcp");
@@ -837,7 +837,7 @@ expand_enter (struct servtab *sep)
     proto = getprotobyname ("udp");
   else
     proto = getprotobyname (sep->se_proto);
-  
+
   if (!proto)
     {
       syslog (LOG_ERR, "%s: Unknown protocol", sep->se_proto);
@@ -862,19 +862,19 @@ expand_enter (struct servtab *sep)
 	errmsg = strerror (errno);
       else
 	errmsg = gai_strerror (err);
-      
+
       syslog (LOG_ERR, "%s/%s: getaddrinfo: %s",
 	      sep->se_service, sep->se_proto, errmsg);
       return 1;
     }
-  
+
   for (rp = result; rp != NULL; rp = rp->ai_next)
     {
       memcpy (&sep->se_ctrladdr, rp->ai_addr, rp->ai_addrlen);
       cp = enter (sep);
       servent_setup (cp);
     }
-    
+
   freeaddrinfo (result);
 
   return 0;
@@ -884,7 +884,7 @@ int
 expand_enter (struct servtab *sep)
 {
   struct servent *sp;
-  
+
   sp = getservbyname (sep->se_service, sep->se_proto);
   if (sp == 0)
     {
@@ -892,7 +892,7 @@ expand_enter (struct servtab *sep)
       char *p;
       unsigned long val;
       unsigned short port;
-      
+
       val = strtoul (sep->se_service, &p, 0);
       if (*p || (port = val) != val)
 	{
@@ -935,7 +935,7 @@ expand_enter (struct servtab *sep)
 	  memcpy (&sep->se_ctrladdr.sin_addr.s_addr, *p, host->h_length);
 	  cp = enter (sep);
 	  servent_setup (cp);
-	}  
+	}
     }
   return 0;
 }
@@ -1026,7 +1026,7 @@ getconfigent (FILE *fconfig, const char *file, size_t *line)
     return next_node_sep (sep);
 
   memset ((caddr_t) sep, 0, sizeof *sep);
-  
+
   while (1)
     {
       argcv_free (argc, argv);
@@ -1080,7 +1080,7 @@ getconfigent (FILE *fconfig, const char *file, size_t *line)
 	    }
 	  else
 	      node = NULL;
-	  
+
 	  service = argv[INETD_SERVICE];
         }
       else
@@ -1164,7 +1164,7 @@ getconfigent (FILE *fconfig, const char *file, size_t *line)
 #endif
       {
 	char *p, *q;
-	
+
 	p = strchr(argv[INETD_WAIT], '.');
 	if (p)
 	  *p++ = 0;
@@ -1185,7 +1185,7 @@ getconfigent (FILE *fconfig, const char *file, size_t *line)
 		      file, (unsigned long) *line, p);
 	  }
       }
-      
+
       if (ISMUX (sep))
 	{
 	  /*
@@ -1313,7 +1313,7 @@ fix_tcpmux ()
   struct servtab *sep;
   int need_tcpmux = 0;
   int has_tcpmux = 0;
-  
+
   for (sep = servtab; sep; sep = sep->se_next)
     {
       if (sep->se_checked)
@@ -1338,10 +1338,10 @@ fix_tcpmux ()
       memset (&serv, 0, sizeof (serv));
 
       serv.se_service = newstr ("tcpmux");
-      serv.se_socktype = SOCK_STREAM;	  
-      serv.se_proto = newstr ("tcp");	  
+      serv.se_socktype = SOCK_STREAM;
+      serv.se_proto = newstr ("tcp");
       serv.se_checked = 1;
-      serv.se_user = newstr ("root");	
+      serv.se_user = newstr ("root");
       serv.se_bi = bi_lookup (&serv);
       if (!serv.se_bi)
 	{
@@ -1353,9 +1353,9 @@ fix_tcpmux ()
 	  return;
 	}
       serv.se_wait = serv.se_bi->bi_wait;
-      serv.se_server = newstr ("internal");		
-      serv.se_fd = -1;			
-      serv.se_type = NORM_TYPE;		
+      serv.se_server = newstr ("internal");
+      serv.se_fd = -1;
+      serv.se_type = NORM_TYPE;
 #ifdef IPV6
       serv.se_family = AF_INET6;
       serv.se_v4mapped = 1;
@@ -1430,7 +1430,7 @@ config (int signo)
   free (linebuf);
   linebuf = NULL;
   linebufsize = 0;
-  
+
   fix_tcpmux ();
 }
 
@@ -1872,7 +1872,7 @@ prepenv (int ctrl, struct sockaddr_in sa_client)
 }
 
 
-  
+
 int
 main (int argc, char *argv[], char *envp[])
 {
@@ -1882,7 +1882,7 @@ main (int argc, char *argv[], char *envp[])
   pid_t pid;
 
   set_program_name (argv[0]);
-  
+
   Argv = argv;
   if (envp == 0 || *envp == 0)
     envp = argv;
diff --git a/logger/logger.c b/src/logger.c
similarity index 99%
rename from logger/logger.c
rename to src/logger.c
index d0cb2d7..886f890 100644
--- a/logger/logger.c
+++ b/src/logger.c
@@ -63,7 +63,7 @@ int
 decode (char *name, CODE *codetab, const char *what)
 {
   CODE *cp;
-  
+
   if (isdigit (*name))
     {
       char *p;
@@ -74,7 +74,7 @@ decode (char *name, CODE *codetab, const char *what)
 	error (EXIT_FAILURE, 0, "%s: invalid %s number", what, name);
       return c;
     }
-    
+
   for (cp = codetab; cp->c_name; cp++)
     {
       if (strcasecmp (name, cp->c_name) == 0)
@@ -89,7 +89,7 @@ parse_level (char *str)
 {
   char *p;
   int fac, pri = 0;
-  
+
   p = strchr (str, '.');
   if (p)
     *p++ = 0;
@@ -116,7 +116,7 @@ open_socket ()
   union logger_sockaddr sockaddr;
   socklen_t socklen;
   int family;
-  
+
   if (host[0] == '/')
     {
       size_t len = strlen (host);
@@ -170,7 +170,7 @@ open_socket ()
   fd = socket (family, SOCK_DGRAM, 0);
   if (fd < 0)
     error (EXIT_FAILURE, errno, "cannot create socket");
-  
+
   if (family == PF_INET)
     {
       struct sockaddr_in s;
@@ -188,7 +188,7 @@ open_socket ()
       if (bind(fd, (struct sockaddr*) &s, sizeof(s)) < 0)
 	error (EXIT_FAILURE, errno, "cannot bind to source address");
     }
-  
+
   if (connect (fd, &sockaddr.sa, socklen))
     error (EXIT_FAILURE, errno, "cannot connect");
 }
@@ -201,7 +201,7 @@ send_to_syslog (const char *msg)
   time_t now = time (NULL);
   size_t len;
   ssize_t rc;
-  
+
   if (logflags & LOG_PID)
     rc = asprintf (&pbuf, "<%d>%.15s %s[%s]: %s",
 		   pri, ctime (&now) + 4, tag, pidstr, msg);
@@ -216,7 +216,7 @@ send_to_syslog (const char *msg)
     {
       struct iovec iov[2], *ioptr;
       size_t msglen = strlen (msg);
-      
+
       ioptr = iov;
       ioptr->iov_base = (char*) msg;
       ioptr->iov_len = msglen;
@@ -272,7 +272,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case 'S':
       source = arg;
       break;
-      
+
     case 'i':
       logflags |= LOG_PID;
       if (arg)
@@ -321,7 +321,7 @@ main (int argc, char *argv[])
 {
   int index;
   char *buf = NULL;
-  
+
   set_program_name (argv[0]);
   iu_argp_init ("logger", program_authors);
   argp_parse (&argp, argc, argv, 0, &index, NULL);
@@ -343,13 +343,13 @@ main (int argc, char *argv[])
     }
 
   open_socket ();
-  
+
   if (argc > 0)
     {
       int i;
       size_t len = 0;
       char *p;
-      
+
       for (i = 0; i < argc; i++)
 	len += strlen (argv[i]) + 1;
 
@@ -368,7 +368,7 @@ main (int argc, char *argv[])
   else
     {
       size_t size = 0;
-      
+
       while (getline (&buf, &size, stdin) > 0)
 	send_to_syslog (buf);
     }
diff --git a/rcp/rcp.c b/src/rcp.c
similarity index 99%
rename from rcp/rcp.c
rename to src/rcp.c
index fa1c4ee..ce7e058 100644
--- a/rcp/rcp.c
+++ b/src/rcp.c
@@ -180,7 +180,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
       use_kerberos = 0;
       break;
 #endif
-	
+
 #ifdef KERBEROS
     case 'k':
       dest_realm = arg;
@@ -259,7 +259,7 @@ main (int argc, char *argv[])
   char *targ;
   const char *shell;
   int index, rc;
-  
+
   set_program_name (argv[0]);
 
   from_option = to_option = 0;
@@ -314,7 +314,7 @@ main (int argc, char *argv[])
 
   if (argc < 2)
     error (1, 0, "not enough arguments");
-  
+
   if (argc > 2)
     targetshouldbedirectory = 1;
 
diff --git a/rexec/rexec.c b/src/rexec.c
similarity index 100%
rename from rexec/rexec.c
rename to src/rexec.c
diff --git a/rexecd/rexecd.c b/src/rexecd.c
similarity index 100%
rename from rexecd/rexecd.c
rename to src/rexecd.c
diff --git a/rlogin/rlogin.c b/src/rlogin.c
similarity index 99%
rename from rlogin/rlogin.c
rename to src/rlogin.c
index 70d0efa..8b80596 100644
--- a/rlogin/rlogin.c
+++ b/src/rlogin.c
@@ -336,7 +336,7 @@ main (int argc, char *argv[])
   char term[1024];
 
   set_program_name (argv[0]);
-  
+
   /* Traditionnaly, if a symbolic link was made to the rlogin binary
      rlogin --> hostname
      hostname will be use as the name of the server to login too.  */
diff --git a/rlogind/rlogind.c b/src/rlogind.c
similarity index 99%
rename from rlogind/rlogind.c
rename to src/rlogind.c
index 34eb76e..d247b6a 100644
--- a/rlogind/rlogind.c
+++ b/src/rlogind.c
@@ -354,11 +354,11 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case 'p':
       port = strtoul (arg, NULL, 10);
       break;
-      
+
     case 'r':
       reverse_required = 1;
       break;
-      
+
     default:
       return ARGP_ERR_UNKNOWN;
     }
@@ -376,11 +376,11 @@ main (int argc, char *argv[])
   int index;
 
   set_program_name (argv[0]);
-  
+
   /* Parse command line */
   iu_argp_init ("rlogind", program_authors);
   argp_parse (&argp, argc, argv, 0, &index, NULL);
-  
+
   openlog ("rlogind", LOG_PID | LOG_CONS, LOG_AUTH);
   argc -= index;
   if (argc > 0)
diff --git a/rsh/rsh.c b/src/rsh.c
similarity index 99%
rename from rsh/rsh.c
rename to src/rsh.c
index 3bdc4b8..97c6621 100644
--- a/rsh/rsh.c
+++ b/src/rsh.c
@@ -176,7 +176,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case 'l':
       user = arg;
       break;
-      
+
 #if defined(KERBEROS) || defined(SHISHI)
     case 'K':
       use_kerberos = 0;
diff --git a/rshd/rshd.c b/src/rshd.c
similarity index 99%
rename from rshd/rshd.c
rename to src/rshd.c
index 173f0d5..747e72b 100644
--- a/rshd/rshd.c
+++ b/src/rshd.c
@@ -213,7 +213,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case 'L':
       log_success = 1;
       break;
-      
+
     default:
       return ARGP_ERR_UNKNOWN;
     }
@@ -240,7 +240,7 @@ main (int argc, char *argv[])
   set_program_name (argv[0]);
   iu_argp_init ("rshd", default_program_authors);
   argp_parse (&argp, argc, argv, 0, &index, NULL);
-  
+
   openlog ("rshd", LOG_PID | LOG_ODELAY, LOG_DAEMON);
 
   argc -= index;
@@ -694,7 +694,7 @@ doit (int sockfd, struct sockaddr_in *fromp)
 
     /* verify checksum */
 
-    /* Doesn't give socket port ? 
+    /* Doesn't give socket port ?
        if (getsockname (STDIN_FILENO, (struct sockaddr *)&sock, &socklen) < 0)
        {
        syslog (LOG_ERR, "Can't get sock name");
diff --git a/syslogd/syslogd.c b/src/syslogd.c
similarity index 100%
rename from syslogd/syslogd.c
rename to src/syslogd.c
diff --git a/tftp/tftp.c b/src/tftp.c
similarity index 100%
rename from tftp/tftp.c
rename to src/tftp.c
diff --git a/tftpd/tftpd.c b/src/tftpd.c
similarity index 99%
rename from tftpd/tftpd.c
rename to src/tftpd.c
index ec8f539..07a8e34 100644
--- a/tftpd/tftpd.c
+++ b/src/tftpd.c
@@ -138,7 +138,7 @@ static struct argp_option options[] = {
     "nonexistent relative filenames" },
   { NULL }
 };
-  
+
 static error_t
 parse_opt (int key, char *arg, struct argp_state *state)
 {
@@ -151,7 +151,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case 'n':
       suppress_naks = 1;
       break;
-      
+
     default:
       return ARGP_ERR_UNKNOWN;
     }
@@ -179,7 +179,7 @@ main (int argc, char *argv[])
   set_program_name (argv[0]);
   iu_argp_init ("tftpd", default_program_authors);
   argp_parse (&argp, argc, argv, 0, &index, NULL);
-  
+
   openlog ("tftpd", LOG_PID, LOG_FTP);
 
   if (index < argc)
diff --git a/traceroute/traceroute.c b/src/traceroute.c
similarity index 98%
rename from traceroute/traceroute.c
rename to src/traceroute.c
index e12c30e..d847d1c 100644
--- a/traceroute/traceroute.c
+++ b/src/traceroute.c
@@ -186,7 +186,7 @@ main (int argc, char **argv)
   trace_t trace;
 
   set_program_name (argv[0]);
-  
+
   /* Parse command line */
   iu_argp_init ("traceroute", program_authors);
   argp_parse (&argp, argc, argv, 0, NULL, NULL);
@@ -281,7 +281,7 @@ do_try (trace_t * trace, const int hop,
 		}
 	      else
 		{
- 		  if (tries == 0 || prev_addr != trace->from.sin_addr.s_addr)
+		  if (tries == 0 || prev_addr != trace->from.sin_addr.s_addr)
 		    printf (" %s (%s) ",
 			    inet_ntoa (trace->from.sin_addr),
 			    get_hostname (&trace->from.sin_addr));
@@ -302,7 +302,7 @@ get_hostname (struct in_addr *addr)
 {
   if (opt_resolve_hostnames)
     {
-      struct hostent *info = 
+      struct hostent *info =
 	gethostbyaddr ((char *) addr, sizeof (*addr), AF_INET);
       if (info != NULL)
 	return info->h_name;
@@ -328,7 +328,7 @@ trace_init (trace_t * t, const struct sockaddr_in to,
       if (t->udpfd < 0)
         error (EXIT_FAILURE, errno, "socket");
 
-      if (setsockopt (t->udpfd, IPPROTO_IP, IP_TTL, ttlp, 
+      if (setsockopt (t->udpfd, IPPROTO_IP, IP_TTL, ttlp,
 		      sizeof (t->ttl)) < 0)
         error (EXIT_FAILURE, errno, "setsockopt");
     }
@@ -401,18 +401,18 @@ trace_read (trace_t * t)
 	    || (ic->icmp_type == ICMP_DEST_UNREACH
 		&& ic->icmp_code != ICMP_PORT_UNREACH))
 	  return -1;
-	
+
 	/* check whether it's for us */
         port = (unsigned short *) &ic->icmp_ip + 11;
 	if (*port != t->to.sin_port)
 	  return -1;
-	
+
 	if (ic->icmp_code == ICMP_PORT_UNREACH)
 	  /* FIXME: Ugly hack. */
 	  stop = 1;
       }
       break;
-      
+
     case TRACE_ICMP:
       if (ic->icmp_type != ICMP_TIME_EXCEEDED
 	  && ic->icmp_type != ICMP_ECHOREPLY)
@@ -449,7 +449,7 @@ trace_write (trace_t * t)
   int len;
 
   assert (t);
-  
+
   switch (t->type)
     {
     case TRACE_UDP:
@@ -467,19 +467,19 @@ trace_write (trace_t * t)
                 error (EXIT_FAILURE, errno, "sendto");
 	      }
 	  }
-	
+
 	if (gettimeofday (&t->tsent, NULL) < 0)
           error (EXIT_FAILURE, errno, "gettimeofday");
       }
       break;
-      
+
     case TRACE_ICMP:
       {
 	icmphdr_t hdr;
 	/* FIXME: We could use the pid as the icmp seqno/ident. */
 	if (icmp_echo_encode ((u_char *) &hdr, sizeof (hdr), pid, pid))
 	  return -1;
-	
+
 	len = sendto (t->icmpfd, (char *) &hdr, sizeof (hdr),
 		      0, (struct sockaddr *) &t->to, sizeof (t->to));
 	if (len < 0)
@@ -492,14 +492,14 @@ trace_write (trace_t * t)
                 error (EXIT_FAILURE, errno, "sendto");
 	      }
 	  }
-	
+
 	if (gettimeofday (&t->tsent, NULL) < 0)
           error (EXIT_FAILURE, errno, "gettimeofday");
       }
       break;
-      
+
       /* FIXME: type according to RFC 1393 */
-      
+
     default:
       break;
     }
diff --git a/uucpd/uucpd.c b/src/uucpd.c
similarity index 100%
rename from uucpd/uucpd.c
rename to src/uucpd.c
diff --git a/syslogd/.gitignore b/syslogd/.gitignore
deleted file mode 100644
index e9bfd1e..0000000
--- a/syslogd/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-syslogd
-
diff --git a/syslogd/Makefile.am b/syslogd/Makefile.am
deleted file mode 100644
index 1054a24..0000000
--- a/syslogd/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-inetdaemondir = @inetdaemondir@
-
-inetdaemon_PROGRAMS = @syslogd_BUILD@
-
-EXTRA_PROGRAMS = syslogd
-
-syslogd_SOURCES = syslogd.c
-
-@PATHDEFS_MAKE@
-
-AM_CPPFLAGS = $(PATHDEF_LOG) $(PATHDEF_KLOG) $(PATHDEF_LOGCONF) \
-              $(PATHDEF_LOGPID) $(PATHDEF_CONSOLE) $(PATHDEF_UTMP)
-
-INCLUDES = -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib -I../lib 
-
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a
diff --git a/tftp/.gitignore b/tftp/.gitignore
deleted file mode 100644
index 63cfc22..0000000
--- a/tftp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tftp
diff --git a/tftp/Makefile.am b/tftp/Makefile.am
deleted file mode 100644
index e514e80..0000000
--- a/tftp/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-INCLUDES = -I$(top_srcdir)/headers -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib -I../lib
-
-bin_PROGRAMS = @tftp_BUILD@
-
-EXTRA_PROGRAMS = tftp
-
-tftp_SOURCES = tftp.c
-
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a
diff --git a/tftpd/.gitignore b/tftpd/.gitignore
deleted file mode 100644
index 8cb2e41..0000000
--- a/tftpd/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tftpd
diff --git a/tftpd/Makefile.am b/tftpd/Makefile.am
deleted file mode 100644
index 436f7ca..0000000
--- a/tftpd/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-inetdaemondir = @inetdaemondir@
-
-inetdaemon_PROGRAMS = @tftpd_BUILD@
-
-INCLUDES = -I$(top_srcdir)/headers -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils
-
-EXTRA_PROGRAMS = tftpd
-
-tftpd_SOURCES = tftpd.c
-
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a
diff --git a/traceroute/.gitignore b/traceroute/.gitignore
deleted file mode 100644
index 92de28b..0000000
--- a/traceroute/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-traceroute
diff --git a/traceroute/Makefile.am b/traceroute/Makefile.am
deleted file mode 100644
index 41d6e61..0000000
--- a/traceroute/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-bin_PROGRAMS = @traceroute_BUILD@
-
-EXTRA_PROGRAMS = traceroute
-
-traceroute_SOURCES = traceroute.c
-
-INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libicmp -I$(top_srcdir)/libinetutils
-
-LDADD = -L../libicmp -licmp ../lib/libgnu.a
-
-SUIDMODE = -o root -m 4775
-
-install-traceroute-hook:
-	-@for program in $(bin_PROGRAMS); do \
-	$(INSTALL_PROGRAM) $$program $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo $$program|sed '$(transform)'` ; \
-	if test $$? -ne 0; then \
-		echo 'INSTALL-ERROR:'; \
-		echo 'INSTALL-ERROR: THIS PROGRAM('$$program') MUST BE INSTALLED SETUID ROOT'; \
-		echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) '$$program' $(SUIDMODE) $(DESTDIR)$(bindir)/'$$program; \
-		echo 'INSTALL-ERROR:'; \
-	fi \
-	done
-
-install-exec-hook: @traceroute_INSTALL_HOOK@
diff --git a/uucpd/.gitignore b/uucpd/.gitignore
deleted file mode 100644
index aade85e..0000000
--- a/uucpd/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-uucpd
diff --git a/uucpd/Makefile.am b/uucpd/Makefile.am
deleted file mode 100644
index 5e3426c..0000000
--- a/uucpd/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Inetutils.
-#
-# GNU Inetutils is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Inetutils is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see `http://www.gnu.org/licenses/'.
-
-inetdaemondir = @inetdaemondir@
-
-inetdaemon_PROGRAMS = @uucpd_BUILD@
-
-EXTRA_PROGRAMS = uucpd
-
-uucpd_SOURCES = uucpd.c
-
-LIBUTIL = @LIBUTIL@
-LIBCRYPT = @LIBCRYPT@
-
-@PATHDEFS_MAKE@
-
-AM_CPPFLAGS = $(PATHDEF_UUCICO) $(PATHDEF_TTY)
-INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a $(LIBUTIL) $(LIBCRYPT)

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


commit ce4a6a972b0884dc0f40777c5ac22e3b99de14a1
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Jan 12 23:16:39 2010 +0100

    Merged tftp/extern.h and tftp/main.c into tftp/tftp.c.

diff --git a/ChangeLog b/ChangeLog
index 6291244..c0ac290 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2010-01-12  Alfred M. Szmidt  <ams@gnu.org>
+
+	Merged tftp/extern.h and tftp/main.c into tftp/tftp.c.
+
+	* tftp/Makefile.am (tftp_SOURCES): Removed main.c from list.
+	(noinst_HEADERS): Variable removed.
+	* tftp/extern.h, tftp/main.c: Files removed.
+	* tftp/tftp.c: Include <sys/file.h>, <arpa/inet.h>, <fcntl.h>,
+	<netdb.h>, <stdlib.h>, <argp.h>, <libinetutils.h>, "xalloc.h", and
+	"progname.h".  Don't include "extern.h".
+	(TIMEOUT, HELPINDENT, RESOLVE_OK, RESOLVE_FAIL)
+	(RESOLVE_NOT_RESOLVED): New macros.
+	(cmd): New structure.
+	(intr, get, help, modecmd, put, quit, setascii, setbinary)
+	(setpeer, setrexmt, settimeout, settrace, setverbose, status)
+	(command, getusage, makeargv, putusage, settftpmode, getcmd, tail)
+	(recvfile, send_file): New forward declarations.
+	(peeraddr, f, port, trace, verbose, connected, mode, line, margc)
+	(margv, prompt, toplevel, sp, vhelp, thelp, chelp, qhelp, hhelp)
+	(shelp, rhelp, mhelp, sthelp, xhelp, ihelp, ashelp, bnhelp)
+	(cmdtab, args_doc, doc, argp_options, host_port_argv)
+	(hostport_argc, toplevel, argp, hostname, modes, rexmtval)
+	(maxtimeout): New variables.
+	(parse_opt, main, resolve_name, get_args, setpeer, modecmd)
+	(setbinary, setascii, setftpmode, put, putusage, get, getusage)
+	(setrexmt, settimeout, status, intr, tail, command, getcmd)
+	(makeargv, quit, help, settrace, setverbose): New functions.
+
 2010-01-08  Simon Josefsson  <simon@josefsson.org>
 
 	* README-alpha: Explain more.
diff --git a/tftp/Makefile.am b/tftp/Makefile.am
index 472da61..e514e80 100644
--- a/tftp/Makefile.am
+++ b/tftp/Makefile.am
@@ -23,8 +23,6 @@ bin_PROGRAMS = @tftp_BUILD@
 
 EXTRA_PROGRAMS = tftp
 
-tftp_SOURCES = main.c tftp.c
-
-noinst_HEADERS = extern.h
+tftp_SOURCES = tftp.c
 
 LDADD = -L../libinetutils -linetutils ../lib/libgnu.a
diff --git a/tftp/extern.h b/tftp/extern.h
deleted file mode 100644
index 3ad4a16..0000000
--- a/tftp/extern.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-  Inc.
-
-  This file is part of GNU Inetutils.
-
-  GNU Inetutils is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or (at
-  your option) any later version.
-
-  GNU Inetutils is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
-
-/*
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-void recvfile (int, char *, char *);
-void send_file (int, char *, char *);
-extern jmp_buf toplevel;
diff --git a/tftp/main.c b/tftp/main.c
deleted file mode 100644
index 6b76457..0000000
--- a/tftp/main.c
+++ /dev/null
@@ -1,809 +0,0 @@
-/*
-  Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-  Inc.
-
-  This file is part of GNU Inetutils.
-
-  GNU Inetutils is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or (at
-  your option) any later version.
-
-  GNU Inetutils is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
-
-/*
- * TFTP User Program -- Command Interface.
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-
-#include <netinet/in.h>
-
-#include <arpa/inet.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <argp.h>
-#include <libinetutils.h>
-
-#include "xalloc.h"
-#include "extern.h"
-#include "progname.h"
-
-#define TIMEOUT		5	/* secs between rexmt's */
-
-struct sockaddr_in peeraddr;
-int f;
-short port;
-int trace;
-int verbose;
-int connected;
-char mode[32];
-char line[200];
-int margc;
-char *margv[20];
-char *prompt = "tftp";
-jmp_buf toplevel;
-void intr ();
-struct servent *sp;
-
-void get (int, char **);
-void help (int, char **);
-void modecmd (int, char **);
-void put (int, char **);
-void quit (int, char **);
-void setascii (int, char **);
-void setbinary (int, char **);
-void setpeer (int, char **);
-void setrexmt (int, char **);
-void settimeout (int, char **);
-void settrace (int, char **);
-void setverbose (int, char **);
-void status (int, char **);
-
-static void command (void);
-
-static void getusage (char *);
-static void makeargv (void);
-static void putusage (char *);
-static void settftpmode (char *);
-
-#define HELPINDENT (sizeof("connect"))
-
-struct cmd
-{
-  char *name;
-  char *help;
-  void (*handler) (int, char **);
-};
-
-char vhelp[] = "toggle verbose mode";
-char thelp[] = "toggle packet tracing";
-char chelp[] = "connect to remote tftp";
-char qhelp[] = "exit tftp";
-char hhelp[] = "print help information";
-char shelp[] = "send file";
-char rhelp[] = "receive file";
-char mhelp[] = "set file transfer mode";
-char sthelp[] = "show current status";
-char xhelp[] = "set per-packet retransmission timeout";
-char ihelp[] = "set total retransmission timeout";
-char ashelp[] = "set mode to netascii";
-char bnhelp[] = "set mode to octet";
-
-struct cmd cmdtab[] = {
-  {"connect", chelp, setpeer},
-  {"mode", mhelp, modecmd},
-  {"put", shelp, put},
-  {"get", rhelp, get},
-  {"quit", qhelp, quit},
-  {"verbose", vhelp, setverbose},
-  {"trace", thelp, settrace},
-  {"status", sthelp, status},
-  {"binary", bnhelp, setbinary},
-  {"ascii", ashelp, setascii},
-  {"rexmt", xhelp, setrexmt},
-  {"timeout", ihelp, settimeout},
-  {"?", hhelp, help},
-  {0}
-};
-
-struct cmd *getcmd ();
-char *tail ();
-
-
-const char args_doc[] = "[HOST [PORT]]";
-const char doc[] = "Trivial file transfer protocol client";
-
-static struct argp_option argp_options[] = {
-  {"verbose", 'v', NULL, 0, "verbose output"},
-  {NULL}
-};
-
-char *hostport_argv[3] = { "connect" };
-int hostport_argc = 1;
-
-static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
-{
-  switch (key)
-    {
-    case 'v':		/* Verbose.  */
-      verbose++;
-      break;
-
-    case ARGP_KEY_ARG:
-      if (state->arg_num >= 2 || hostport_argc >= 3)
-	/* Too many arguments. */
-	argp_usage (state);
-      hostport_argv[hostport_argc++] = arg;
-      break;
-
-    default:
-      return ARGP_ERR_UNKNOWN;
-    }
-
-  return 0;
-}
-
-static struct argp argp = {argp_options, parse_opt, args_doc, doc};
-
-int
-main (int argc, char *argv[])
-{
-  struct sockaddr_in sin;
-
-  set_program_name (argv[0]);
-  iu_argp_init ("tftp", default_program_authors);
-  argp_parse (&argp, argc, argv, 0, NULL, NULL);
-
-  sp = getservbyname ("tftp", "udp");
-  if (sp == 0)
-    {
-      fprintf (stderr, "tftp: udp/tftp: unknown service\n");
-      exit (1);
-    }
-  f = socket (AF_INET, SOCK_DGRAM, 0);
-  if (f < 0)
-    {
-      perror ("tftp: socket");
-      exit (3);
-    }
-  memset (&sin, 0, sizeof (sin));
-  sin.sin_family = AF_INET;
-  if (bind (f, (struct sockaddr *) &sin, sizeof (sin)) < 0)
-    {
-      perror ("tftp: bind");
-      exit (1);
-    }
-  strcpy (mode, "netascii");
-  signal (SIGINT, intr);
-  if (hostport_argc > 1)
-    {
-      if (setjmp (toplevel) != 0)
-	exit (0);
-      setpeer (hostport_argc, hostport_argv);
-    }
-  if (setjmp (toplevel) != 0)
-    putchar ('\n');
-  command ();
-}
-
-char *hostname;
-
-#define RESOLVE_OK            0
-#define RESOLVE_FAIL         -1
-#define RESOLVE_NOT_RESOLVED  1
-
-/* Resolve NAME. Fill in peeraddr, hostname and set connected on success.
-   Return value: RESOLVE_OK success
-                 RESOLVE_FAIL error
-		 RESOLVE_NOT_RESOLVED name is not resolved and ALLOW_NULL
-		 is true */
-static int
-resolve_name (char *name, int allow_null)
-{
-  struct hostent *hp = gethostbyname (name);
-  if (hp == NULL)
-    {
-      if (allow_null)
-	return RESOLVE_NOT_RESOLVED;
-      fprintf (stderr, "tftp: %s: ", name);
-      herror ((char *) NULL);
-      return RESOLVE_FAIL;
-    }
-  else if (hp->h_length != sizeof peeraddr.sin_addr)
-    {
-      fprintf (stderr, "tftp: resolving %s returns unexpected length", name);
-      return RESOLVE_FAIL;
-    }
-  memcpy (&peeraddr.sin_addr, hp->h_addr, hp->h_length);
-  peeraddr.sin_family = hp->h_addrtype;
-  connected = 1;
-  free (hostname);
-  hostname = xstrdup (hp->h_name);
-  return RESOLVE_OK;
-}
-
-/* Prompt for more arguments from the user with PROMPT, putting the results
-   into ARGC & ARGV, with an initial argument of ARG0.  Global variables
-   LINE, MARGC, and MARGV are changed.  */
-static void
-get_args (char *arg0, char *prompt, int *argc, char ***argv)
-{
-  size_t arg0_len = strlen (arg0);
-
-  strcpy (line, arg0);
-  strcat (line, " ");
-
-  printf ("%s", prompt);
-  fgets (line + arg0_len + 1, sizeof line - arg0_len - 1, stdin);
-
-  makeargv ();
-  *argc = margc;
-  *argv = margv;
-}
-
-void
-setpeer (int argc, char *argv[])
-{
-  if (argc < 2)
-    get_args ("Connect", "(to) ", &argc, &argv);
-
-  if (argc < 2 || argc > 3)
-    {
-      printf ("usage: %s host-name [port]\n", argv[0]);
-      return;
-    }
-
-  switch (resolve_name (argv[1], 1))
-    {
-    case RESOLVE_OK:
-      break;
-
-    case RESOLVE_FAIL:
-      return;
-
-    case RESOLVE_NOT_RESOLVED:
-      peeraddr.sin_family = AF_INET;
-      peeraddr.sin_addr.s_addr = inet_addr (argv[1]);
-      if (peeraddr.sin_addr.s_addr == -1)
-	{
-	  connected = 0;
-	  printf ("%s: unknown host\n", argv[1]);
-	  return;
-	}
-      hostname = xstrdup (argv[1]);
-    }
-
-  port = sp->s_port;
-  if (argc == 3)
-    {
-      port = atoi (argv[2]);
-      if (port < 0)
-	{
-	  printf ("%s: bad port number\n", argv[2]);
-	  connected = 0;
-	  return;
-	}
-      port = htons (port);
-    }
-  connected = 1;
-}
-
-struct modes
-{
-  char *m_name;
-  char *m_mode;
-} modes[] =
-  {
-    {"ascii", "netascii"},
-    {"netascii", "netascii"},
-    {"binary", "octet"},
-    {"image", "octet"},
-    {"octet", "octet"},
-    {0, 0}
-  };
-
-void
-modecmd (int argc, char *argv[])
-{
-  register struct modes *p;
-  char *sep;
-
-  if (argc < 2)
-    {
-      printf ("Using %s mode to transfer files.\n", mode);
-      return;
-    }
-  if (argc == 2)
-    {
-      for (p = modes; p->m_name; p++)
-	if (strcmp (argv[1], p->m_name) == 0)
-	  break;
-      if (p->m_name)
-	{
-	  settftpmode (p->m_mode);
-	  return;
-	}
-      printf ("%s: unknown mode\n", argv[1]);
-      /* drop through and print usage message */
-    }
-
-  printf ("usage: %s [", argv[0]);
-  sep = " ";
-  for (p = modes; p->m_name; p++)
-    {
-      printf ("%s%s", sep, p->m_name);
-      if (*sep == ' ')
-	sep = " | ";
-    }
-  printf (" ]\n");
-  return;
-}
-
-void
-setbinary (int argc, char *argv[])
-{
-  settftpmode ("octet");
-}
-
-void
-setascii (int argc, char *argv[])
-{
-  settftpmode ("netascii");
-}
-
-static void
-settftpmode (char *newmode)
-{
-  strcpy (mode, newmode);
-  if (verbose)
-    printf ("mode set to %s\n", mode);
-}
-
-/*
- * Send file(s).
- */
-void
-put (int argc, char *argv[])
-{
-  int fd;
-  register int n;
-  register char *cp, *targ;
-
-  if (argc < 2)
-    get_args ("send", "(file) ", &argc, &argv);
-
-  if (argc < 2)
-    {
-      putusage (argv[0]);
-      return;
-    }
-  targ = argv[argc - 1];
-  if (strchr (argv[argc - 1], ':'))
-    {
-      char *cp;
-
-      for (n = 1; n < argc - 1; n++)
-	if (strchr (argv[n], ':'))
-	  {
-	    putusage (argv[0]);
-	    return;
-	  }
-      cp = argv[argc - 1];
-      targ = strchr (cp, ':');
-      *targ++ = 0;
-      if (resolve_name (cp, 0) != RESOLVE_OK)
-	return;
-    }
-  if (!connected)
-    {
-      printf ("No target machine specified.\n");
-      return;
-    }
-  if (argc < 4)
-    {
-      cp = argc == 2 ? tail (targ) : argv[1];
-      fd = open (cp, O_RDONLY);
-      if (fd < 0)
-	{
-	  fprintf (stderr, "tftp: ");
-	  perror (cp);
-	  return;
-	}
-      if (verbose)
-	printf ("putting %s to %s:%s [%s]\n", cp, hostname, targ, mode);
-      peeraddr.sin_port = port ? port : sp->s_port;
-      send_file (fd, targ, mode);
-      return;
-    }
-  /* this assumes the target is a directory */
-  /* on a remote unix system.  hmmmm.  */
-  cp = strchr (targ, '\0');
-  *cp++ = '/';
-  for (n = 1; n < argc - 1; n++)
-    {
-      strcpy (cp, tail (argv[n]));
-      fd = open (argv[n], O_RDONLY);
-      if (fd < 0)
-	{
-	  fprintf (stderr, "tftp: ");
-	  perror (argv[n]);
-	  continue;
-	}
-      if (verbose)
-	printf ("putting %s to %s:%s [%s]\n", argv[n], hostname, targ, mode);
-      peeraddr.sin_port = port ? port : sp->s_port;
-      send_file (fd, targ, mode);
-    }
-}
-
-static void
-putusage (char *s)
-{
-  printf ("usage: %s file ... host:target, or\n", s);
-  printf ("       %s file ... target (when already connected)\n", s);
-}
-
-/*
- * Receive file(s).
- */
-void
-get (int argc, char *argv[])
-{
-  int fd;
-  register int n;
-  register char *cp;
-  char *src;
-
-  if (argc < 2)
-    get_args ("get", "(files) ", &argc, &argv);
-
-  if (argc < 2)
-    {
-      getusage (argv[0]);
-      return;
-    }
-  if (!connected)
-    {
-      for (n = 1; n < argc; n++)
-	if (strchr (argv[n], ':') == 0)
-	  {
-	    getusage (argv[0]);
-	    return;
-	  }
-    }
-  for (n = 1; n < argc; n++)
-    {
-      src = strchr (argv[n], ':');
-      if (src == NULL)
-	src = argv[n];
-      else
-	{
-	  *src++ = 0;
-	  if (resolve_name (argv[n], 0) != RESOLVE_OK)
-	    continue;
-	}
-
-      if (argc < 4)
-	{
-	  cp = argc == 3 ? argv[2] : tail (src);
-	  fd = creat (cp, 0644);
-	  if (fd < 0)
-	    {
-	      fprintf (stderr, "tftp: ");
-	      perror (cp);
-	      return;
-	    }
-	  if (verbose)
-	    printf ("getting from %s:%s to %s [%s]\n",
-		    hostname, src, cp, mode);
-	  peeraddr.sin_port = port ? port : sp->s_port;
-	  recvfile (fd, src, mode);
-	  break;
-	}
-      cp = tail (src);		/* new .. jdg */
-      fd = creat (cp, 0644);
-      if (fd < 0)
-	{
-	  fprintf (stderr, "tftp: ");
-	  perror (cp);
-	  continue;
-	}
-      if (verbose)
-	printf ("getting from %s:%s to %s [%s]\n", hostname, src, cp, mode);
-      peeraddr.sin_port = port ? port : sp->s_port;
-      recvfile (fd, src, mode);
-    }
-}
-
-static void
-getusage (char *s)
-{
-  printf ("usage: %s host:file host:file ... file, or\n", s);
-  printf ("       %s file file ... file if connected\n", s);
-}
-
-int rexmtval = TIMEOUT;
-
-void
-setrexmt (int argc, char *argv[])
-{
-  int t;
-
-  if (argc < 2)
-    get_args ("Rexmt-timeout", "(value) ", &argc, &argv);
-
-  if (argc != 2)
-    {
-      printf ("usage: %s value\n", argv[0]);
-      return;
-    }
-  t = atoi (argv[1]);
-  if (t < 0)
-    printf ("%s: bad value\n", argv[1]);
-  else
-    rexmtval = t;
-}
-
-int maxtimeout = 5 * TIMEOUT;
-
-void
-settimeout (int argc, char *argv[])
-{
-  int t;
-
-  if (argc < 2)
-    get_args ("Maximum-timeout", "(value) ", &argc, &argv);
-
-  if (argc != 2)
-    {
-      printf ("usage: %s value\n", argv[0]);
-      return;
-    }
-  t = atoi (argv[1]);
-  if (t < 0)
-    printf ("%s: bad value\n", argv[1]);
-  else
-    maxtimeout = t;
-}
-
-void
-status (int argc, char *argv[])
-{
-  if (connected)
-    printf ("Connected to %s.\n", hostname);
-  else
-    printf ("Not connected.\n");
-  printf ("Mode: %s Verbose: %s Tracing: %s\n", mode,
-	  verbose ? "on" : "off", trace ? "on" : "off");
-  printf ("Rexmt-interval: %d seconds, Max-timeout: %d seconds\n",
-	  rexmtval, maxtimeout);
-}
-
-void
-intr ()
-{
-  signal (SIGALRM, SIG_IGN);
-  alarm (0);
-  longjmp (toplevel, -1);
-}
-
-char *
-tail (char *filename)
-{
-  register char *s;
-
-  while (*filename)
-    {
-      s = strrchr (filename, '/');
-      if (s == NULL)
-	break;
-      if (s[1])
-	return (s + 1);
-      *s = '\0';
-    }
-  return filename;
-}
-
-/*
- * Command parser.
- */
-static void
-command ()
-{
-  register struct cmd *c;
-
-  for (;;)
-    {
-      printf ("%s> ", prompt);
-      if (fgets (line, sizeof line, stdin) == 0)
-	{
-	  if (feof (stdin))
-	    exit (0);
-	  else
-	    continue;
-	}
-      if (line[0] == 0)
-	continue;
-      makeargv ();
-      if (margc == 0)
-	continue;
-      c = getcmd (margv[0]);
-      if (c == (struct cmd *) -1)
-	{
-	  printf ("?Ambiguous command\n");
-	  continue;
-	}
-      if (c == 0)
-	{
-	  printf ("?Invalid command\n");
-	  continue;
-	}
-      (*c->handler) (margc, margv);
-    }
-}
-
-struct cmd *
-getcmd (register char *name)
-{
-  register char *p, *q;
-  register struct cmd *c, *found;
-  register int nmatches, longest;
-
-  longest = 0;
-  nmatches = 0;
-  found = 0;
-  for (c = cmdtab; (p = c->name) != NULL; c++)
-    {
-      for (q = name; *q == *p++; q++)
-	if (*q == 0)		/* exact match? */
-	  return (c);
-
-      if (!*q)
-	{			/* the name was a prefix */
-	  if (q - name > longest)
-	    {
-	      longest = q - name;
-	      nmatches = 1;
-	      found = c;
-	    }
-	  else if (q - name == longest)
-	    nmatches++;
-	}
-    }
-  if (nmatches > 1)
-    return (struct cmd *) -1;
-  return found;
-}
-
-/*
- * Slice a string up into argc/argv.
- */
-static void
-makeargv ()
-{
-  register char *cp;
-  register char **argp = margv;
-
-  margc = 0;
-  for (cp = line; *cp;)
-    {
-      while (isspace (*cp))
-	cp++;
-      if (*cp == '\0')
-	break;
-      *argp++ = cp;
-      margc += 1;
-      while (*cp != '\0' && !isspace (*cp))
-	cp++;
-      if (*cp == '\0')
-	break;
-      *cp++ = '\0';
-    }
-  *argp++ = 0;
-}
-
-void
-quit (int argc, char *argv[])
-{
-  exit (0);
-}
-
-/*
- * Help command.
- */
-void
-help (int argc, char *argv[])
-{
-  register struct cmd *c;
-
-  if (argc == 1)
-    {
-      printf ("Commands may be abbreviated.  Commands are:\n\n");
-      for (c = cmdtab; c->name; c++)
-	printf ("%-*s\t%s\n", (int) HELPINDENT, c->name, c->help);
-      return;
-    }
-
-  while (--argc > 0)
-    {
-      register char *arg;
-
-      arg = *++argv;
-      c = getcmd (arg);
-      if (c == (struct cmd *) -1)
-	printf ("?Ambiguous help command %s\n", arg);
-      else if (c == (struct cmd *) 0)
-	printf ("?Invalid help command %s\n", arg);
-      else
-	printf ("%s\n", c->help);
-    }
-}
-
-void
-settrace (int argc, char **argv)
-{
-  trace = !trace;
-  printf ("Packet tracing %s.\n", trace ? "on" : "off");
-}
-
-void
-setverbose (int argc, char **argv)
-{
-  verbose = !verbose;
-  printf ("Verbose mode %s.\n", verbose ? "on" : "off");
-}
diff --git a/tftp/tftp.c b/tftp/tftp.c
index 17ffea0..8c92ea0 100644
--- a/tftp/tftp.c
+++ b/tftp/tftp.c
@@ -49,16 +49,13 @@
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
 
-/*
- * TFTP User Program -- Protocol Machines
- */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/file.h>
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
@@ -73,15 +70,23 @@
 #include <netinet/in.h>
 
 #include <arpa/tftp.h>
+#include <arpa/inet.h>
 
 #include <errno.h>
+#include <fcntl.h>
+#include <netdb.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <argp.h>
 
-#include "extern.h"
+#include <libinetutils.h>
+
+#include "xalloc.h"
+#include "progname.h"
 #include "tftpsubs.h"
 
 extern struct sockaddr_in peeraddr;	/* filled in by main */
@@ -104,6 +109,735 @@ static void stopclock (void);
 static void timer (int);
 static void tpacket (const char *, struct tftphdr *, int);
 
+#define TIMEOUT		5	/* secs between rexmt's */
+
+struct sockaddr_in peeraddr;
+int f;
+short port;
+int trace;
+int verbose;
+int connected;
+char mode[32];
+char line[200];
+int margc;
+char *margv[20];
+char *prompt = "tftp";
+jmp_buf toplevel;
+void intr ();
+struct servent *sp;
+
+void get (int, char **);
+void help (int, char **);
+void modecmd (int, char **);
+void put (int, char **);
+void quit (int, char **);
+void setascii (int, char **);
+void setbinary (int, char **);
+void setpeer (int, char **);
+void setrexmt (int, char **);
+void settimeout (int, char **);
+void settrace (int, char **);
+void setverbose (int, char **);
+void status (int, char **);
+
+static void command (void);
+
+static void getusage (char *);
+static void makeargv (void);
+static void putusage (char *);
+static void settftpmode (char *);
+
+#define HELPINDENT (sizeof("connect"))
+
+struct cmd
+{
+  char *name;
+  char *help;
+  void (*handler) (int, char **);
+};
+
+char vhelp[] = "toggle verbose mode";
+char thelp[] = "toggle packet tracing";
+char chelp[] = "connect to remote tftp";
+char qhelp[] = "exit tftp";
+char hhelp[] = "print help information";
+char shelp[] = "send file";
+char rhelp[] = "receive file";
+char mhelp[] = "set file transfer mode";
+char sthelp[] = "show current status";
+char xhelp[] = "set per-packet retransmission timeout";
+char ihelp[] = "set total retransmission timeout";
+char ashelp[] = "set mode to netascii";
+char bnhelp[] = "set mode to octet";
+
+struct cmd cmdtab[] = {
+  {"connect", chelp, setpeer},
+  {"mode", mhelp, modecmd},
+  {"put", shelp, put},
+  {"get", rhelp, get},
+  {"quit", qhelp, quit},
+  {"verbose", vhelp, setverbose},
+  {"trace", thelp, settrace},
+  {"status", sthelp, status},
+  {"binary", bnhelp, setbinary},
+  {"ascii", ashelp, setascii},
+  {"rexmt", xhelp, setrexmt},
+  {"timeout", ihelp, settimeout},
+  {"?", hhelp, help},
+  {0}
+};
+
+struct cmd *getcmd ();
+char *tail ();
+
+
+const char args_doc[] = "[HOST [PORT]]";
+const char doc[] = "Trivial file transfer protocol client";
+
+static struct argp_option argp_options[] = {
+  {"verbose", 'v', NULL, 0, "verbose output"},
+  {NULL}
+};
+
+char *hostport_argv[3] = { "connect" };
+int hostport_argc = 1;
+
+void recvfile (int, char *, char *);
+void send_file (int, char *, char *);
+
+static error_t
+parse_opt (int key, char *arg, struct argp_state *state)
+{
+  switch (key)
+    {
+    case 'v':		/* Verbose.  */
+      verbose++;
+      break;
+
+    case ARGP_KEY_ARG:
+      if (state->arg_num >= 2 || hostport_argc >= 3)
+	/* Too many arguments. */
+	argp_usage (state);
+      hostport_argv[hostport_argc++] = arg;
+      break;
+
+    default:
+      return ARGP_ERR_UNKNOWN;
+    }
+
+  return 0;
+}
+
+static struct argp argp = {argp_options, parse_opt, args_doc, doc};
+
+int
+main (int argc, char *argv[])
+{
+  struct sockaddr_in sin;
+
+  set_program_name (argv[0]);
+  iu_argp_init ("tftp", default_program_authors);
+  argp_parse (&argp, argc, argv, 0, NULL, NULL);
+
+  sp = getservbyname ("tftp", "udp");
+  if (sp == 0)
+    {
+      fprintf (stderr, "tftp: udp/tftp: unknown service\n");
+      exit (1);
+    }
+  f = socket (AF_INET, SOCK_DGRAM, 0);
+  if (f < 0)
+    {
+      perror ("tftp: socket");
+      exit (3);
+    }
+  memset (&sin, 0, sizeof (sin));
+  sin.sin_family = AF_INET;
+  if (bind (f, (struct sockaddr *) &sin, sizeof (sin)) < 0)
+    {
+      perror ("tftp: bind");
+      exit (1);
+    }
+  strcpy (mode, "netascii");
+  signal (SIGINT, intr);
+  if (hostport_argc > 1)
+    {
+      if (setjmp (toplevel) != 0)
+	exit (0);
+      setpeer (hostport_argc, hostport_argv);
+    }
+  if (setjmp (toplevel) != 0)
+    putchar ('\n');
+  command ();
+}
+
+char *hostname;
+
+#define RESOLVE_OK            0
+#define RESOLVE_FAIL         -1
+#define RESOLVE_NOT_RESOLVED  1
+
+/* Resolve NAME. Fill in peeraddr, hostname and set connected on success.
+   Return value: RESOLVE_OK success
+                 RESOLVE_FAIL error
+		 RESOLVE_NOT_RESOLVED name is not resolved and ALLOW_NULL
+		 is true */
+static int
+resolve_name (char *name, int allow_null)
+{
+  struct hostent *hp = gethostbyname (name);
+  if (hp == NULL)
+    {
+      if (allow_null)
+	return RESOLVE_NOT_RESOLVED;
+      fprintf (stderr, "tftp: %s: ", name);
+      herror ((char *) NULL);
+      return RESOLVE_FAIL;
+    }
+  else if (hp->h_length != sizeof peeraddr.sin_addr)
+    {
+      fprintf (stderr, "tftp: resolving %s returns unexpected length", name);
+      return RESOLVE_FAIL;
+    }
+  memcpy (&peeraddr.sin_addr, hp->h_addr, hp->h_length);
+  peeraddr.sin_family = hp->h_addrtype;
+  connected = 1;
+  free (hostname);
+  hostname = xstrdup (hp->h_name);
+  return RESOLVE_OK;
+}
+
+/* Prompt for more arguments from the user with PROMPT, putting the results
+   into ARGC & ARGV, with an initial argument of ARG0.  Global variables
+   LINE, MARGC, and MARGV are changed.  */
+static void
+get_args (char *arg0, char *prompt, int *argc, char ***argv)
+{
+  size_t arg0_len = strlen (arg0);
+
+  strcpy (line, arg0);
+  strcat (line, " ");
+
+  printf ("%s", prompt);
+  fgets (line + arg0_len + 1, sizeof line - arg0_len - 1, stdin);
+
+  makeargv ();
+  *argc = margc;
+  *argv = margv;
+}
+
+void
+setpeer (int argc, char *argv[])
+{
+  if (argc < 2)
+    get_args ("Connect", "(to) ", &argc, &argv);
+
+  if (argc < 2 || argc > 3)
+    {
+      printf ("usage: %s host-name [port]\n", argv[0]);
+      return;
+    }
+
+  switch (resolve_name (argv[1], 1))
+    {
+    case RESOLVE_OK:
+      break;
+
+    case RESOLVE_FAIL:
+      return;
+
+    case RESOLVE_NOT_RESOLVED:
+      peeraddr.sin_family = AF_INET;
+      peeraddr.sin_addr.s_addr = inet_addr (argv[1]);
+      if (peeraddr.sin_addr.s_addr == -1)
+	{
+	  connected = 0;
+	  printf ("%s: unknown host\n", argv[1]);
+	  return;
+	}
+      hostname = xstrdup (argv[1]);
+    }
+
+  port = sp->s_port;
+  if (argc == 3)
+    {
+      port = atoi (argv[2]);
+      if (port < 0)
+	{
+	  printf ("%s: bad port number\n", argv[2]);
+	  connected = 0;
+	  return;
+	}
+      port = htons (port);
+    }
+  connected = 1;
+}
+
+struct modes
+{
+  char *m_name;
+  char *m_mode;
+} modes[] =
+  {
+    {"ascii", "netascii"},
+    {"netascii", "netascii"},
+    {"binary", "octet"},
+    {"image", "octet"},
+    {"octet", "octet"},
+    {0, 0}
+  };
+
+void
+modecmd (int argc, char *argv[])
+{
+  register struct modes *p;
+  char *sep;
+
+  if (argc < 2)
+    {
+      printf ("Using %s mode to transfer files.\n", mode);
+      return;
+    }
+  if (argc == 2)
+    {
+      for (p = modes; p->m_name; p++)
+	if (strcmp (argv[1], p->m_name) == 0)
+	  break;
+      if (p->m_name)
+	{
+	  settftpmode (p->m_mode);
+	  return;
+	}
+      printf ("%s: unknown mode\n", argv[1]);
+      /* drop through and print usage message */
+    }
+
+  printf ("usage: %s [", argv[0]);
+  sep = " ";
+  for (p = modes; p->m_name; p++)
+    {
+      printf ("%s%s", sep, p->m_name);
+      if (*sep == ' ')
+	sep = " | ";
+    }
+  printf (" ]\n");
+  return;
+}
+
+void
+setbinary (int argc, char *argv[])
+{
+  settftpmode ("octet");
+}
+
+void
+setascii (int argc, char *argv[])
+{
+  settftpmode ("netascii");
+}
+
+static void
+settftpmode (char *newmode)
+{
+  strcpy (mode, newmode);
+  if (verbose)
+    printf ("mode set to %s\n", mode);
+}
+
+/*
+ * Send file(s).
+ */
+void
+put (int argc, char *argv[])
+{
+  int fd;
+  register int n;
+  register char *cp, *targ;
+
+  if (argc < 2)
+    get_args ("send", "(file) ", &argc, &argv);
+
+  if (argc < 2)
+    {
+      putusage (argv[0]);
+      return;
+    }
+  targ = argv[argc - 1];
+  if (strchr (argv[argc - 1], ':'))
+    {
+      char *cp;
+
+      for (n = 1; n < argc - 1; n++)
+	if (strchr (argv[n], ':'))
+	  {
+	    putusage (argv[0]);
+	    return;
+	  }
+      cp = argv[argc - 1];
+      targ = strchr (cp, ':');
+      *targ++ = 0;
+      if (resolve_name (cp, 0) != RESOLVE_OK)
+	return;
+    }
+  if (!connected)
+    {
+      printf ("No target machine specified.\n");
+      return;
+    }
+  if (argc < 4)
+    {
+      cp = argc == 2 ? tail (targ) : argv[1];
+      fd = open (cp, O_RDONLY);
+      if (fd < 0)
+	{
+	  fprintf (stderr, "tftp: ");
+	  perror (cp);
+	  return;
+	}
+      if (verbose)
+	printf ("putting %s to %s:%s [%s]\n", cp, hostname, targ, mode);
+      peeraddr.sin_port = port ? port : sp->s_port;
+      send_file (fd, targ, mode);
+      return;
+    }
+  /* this assumes the target is a directory */
+  /* on a remote unix system.  hmmmm.  */
+  cp = strchr (targ, '\0');
+  *cp++ = '/';
+  for (n = 1; n < argc - 1; n++)
+    {
+      strcpy (cp, tail (argv[n]));
+      fd = open (argv[n], O_RDONLY);
+      if (fd < 0)
+	{
+	  fprintf (stderr, "tftp: ");
+	  perror (argv[n]);
+	  continue;
+	}
+      if (verbose)
+	printf ("putting %s to %s:%s [%s]\n", argv[n], hostname, targ, mode);
+      peeraddr.sin_port = port ? port : sp->s_port;
+      send_file (fd, targ, mode);
+    }
+}
+
+static void
+putusage (char *s)
+{
+  printf ("usage: %s file ... host:target, or\n", s);
+  printf ("       %s file ... target (when already connected)\n", s);
+}
+
+/*
+ * Receive file(s).
+ */
+void
+get (int argc, char *argv[])
+{
+  int fd;
+  register int n;
+  register char *cp;
+  char *src;
+
+  if (argc < 2)
+    get_args ("get", "(files) ", &argc, &argv);
+
+  if (argc < 2)
+    {
+      getusage (argv[0]);
+      return;
+    }
+  if (!connected)
+    {
+      for (n = 1; n < argc; n++)
+	if (strchr (argv[n], ':') == 0)
+	  {
+	    getusage (argv[0]);
+	    return;
+	  }
+    }
+  for (n = 1; n < argc; n++)
+    {
+      src = strchr (argv[n], ':');
+      if (src == NULL)
+	src = argv[n];
+      else
+	{
+	  *src++ = 0;
+	  if (resolve_name (argv[n], 0) != RESOLVE_OK)
+	    continue;
+	}
+
+      if (argc < 4)
+	{
+	  cp = argc == 3 ? argv[2] : tail (src);
+	  fd = creat (cp, 0644);
+	  if (fd < 0)
+	    {
+	      fprintf (stderr, "tftp: ");
+	      perror (cp);
+	      return;
+	    }
+	  if (verbose)
+	    printf ("getting from %s:%s to %s [%s]\n",
+		    hostname, src, cp, mode);
+	  peeraddr.sin_port = port ? port : sp->s_port;
+	  recvfile (fd, src, mode);
+	  break;
+	}
+      cp = tail (src);		/* new .. jdg */
+      fd = creat (cp, 0644);
+      if (fd < 0)
+	{
+	  fprintf (stderr, "tftp: ");
+	  perror (cp);
+	  continue;
+	}
+      if (verbose)
+	printf ("getting from %s:%s to %s [%s]\n", hostname, src, cp, mode);
+      peeraddr.sin_port = port ? port : sp->s_port;
+      recvfile (fd, src, mode);
+    }
+}
+
+static void
+getusage (char *s)
+{
+  printf ("usage: %s host:file host:file ... file, or\n", s);
+  printf ("       %s file file ... file if connected\n", s);
+}
+
+int rexmtval = TIMEOUT;
+
+void
+setrexmt (int argc, char *argv[])
+{
+  int t;
+
+  if (argc < 2)
+    get_args ("Rexmt-timeout", "(value) ", &argc, &argv);
+
+  if (argc != 2)
+    {
+      printf ("usage: %s value\n", argv[0]);
+      return;
+    }
+  t = atoi (argv[1]);
+  if (t < 0)
+    printf ("%s: bad value\n", argv[1]);
+  else
+    rexmtval = t;
+}
+
+int maxtimeout = 5 * TIMEOUT;
+
+void
+settimeout (int argc, char *argv[])
+{
+  int t;
+
+  if (argc < 2)
+    get_args ("Maximum-timeout", "(value) ", &argc, &argv);
+
+  if (argc != 2)
+    {
+      printf ("usage: %s value\n", argv[0]);
+      return;
+    }
+  t = atoi (argv[1]);
+  if (t < 0)
+    printf ("%s: bad value\n", argv[1]);
+  else
+    maxtimeout = t;
+}
+
+void
+status (int argc, char *argv[])
+{
+  if (connected)
+    printf ("Connected to %s.\n", hostname);
+  else
+    printf ("Not connected.\n");
+  printf ("Mode: %s Verbose: %s Tracing: %s\n", mode,
+	  verbose ? "on" : "off", trace ? "on" : "off");
+  printf ("Rexmt-interval: %d seconds, Max-timeout: %d seconds\n",
+	  rexmtval, maxtimeout);
+}
+
+void
+intr ()
+{
+  signal (SIGALRM, SIG_IGN);
+  alarm (0);
+  longjmp (toplevel, -1);
+}
+
+char *
+tail (char *filename)
+{
+  register char *s;
+
+  while (*filename)
+    {
+      s = strrchr (filename, '/');
+      if (s == NULL)
+	break;
+      if (s[1])
+	return (s + 1);
+      *s = '\0';
+    }
+  return filename;
+}
+
+/*
+ * Command parser.
+ */
+static void
+command ()
+{
+  register struct cmd *c;
+
+  for (;;)
+    {
+      printf ("%s> ", prompt);
+      if (fgets (line, sizeof line, stdin) == 0)
+	{
+	  if (feof (stdin))
+	    exit (0);
+	  else
+	    continue;
+	}
+      if (line[0] == 0)
+	continue;
+      makeargv ();
+      if (margc == 0)
+	continue;
+      c = getcmd (margv[0]);
+      if (c == (struct cmd *) -1)
+	{
+	  printf ("?Ambiguous command\n");
+	  continue;
+	}
+      if (c == 0)
+	{
+	  printf ("?Invalid command\n");
+	  continue;
+	}
+      (*c->handler) (margc, margv);
+    }
+}
+
+struct cmd *
+getcmd (register char *name)
+{
+  register char *p, *q;
+  register struct cmd *c, *found;
+  register int nmatches, longest;
+
+  longest = 0;
+  nmatches = 0;
+  found = 0;
+  for (c = cmdtab; (p = c->name) != NULL; c++)
+    {
+      for (q = name; *q == *p++; q++)
+	if (*q == 0)		/* exact match? */
+	  return (c);
+
+      if (!*q)
+	{			/* the name was a prefix */
+	  if (q - name > longest)
+	    {
+	      longest = q - name;
+	      nmatches = 1;
+	      found = c;
+	    }
+	  else if (q - name == longest)
+	    nmatches++;
+	}
+    }
+  if (nmatches > 1)
+    return (struct cmd *) -1;
+  return found;
+}
+
+/*
+ * Slice a string up into argc/argv.
+ */
+static void
+makeargv ()
+{
+  register char *cp;
+  register char **argp = margv;
+
+  margc = 0;
+  for (cp = line; *cp;)
+    {
+      while (isspace (*cp))
+	cp++;
+      if (*cp == '\0')
+	break;
+      *argp++ = cp;
+      margc += 1;
+      while (*cp != '\0' && !isspace (*cp))
+	cp++;
+      if (*cp == '\0')
+	break;
+      *cp++ = '\0';
+    }
+  *argp++ = 0;
+}
+
+void
+quit (int argc, char *argv[])
+{
+  exit (0);
+}
+
+/*
+ * Help command.
+ */
+void
+help (int argc, char *argv[])
+{
+  register struct cmd *c;
+
+  if (argc == 1)
+    {
+      printf ("Commands may be abbreviated.  Commands are:\n\n");
+      for (c = cmdtab; c->name; c++)
+	printf ("%-*s\t%s\n", (int) HELPINDENT, c->name, c->help);
+      return;
+    }
+
+  while (--argc > 0)
+    {
+      register char *arg;
+
+      arg = *++argv;
+      c = getcmd (arg);
+      if (c == (struct cmd *) -1)
+	printf ("?Ambiguous help command %s\n", arg);
+      else if (c == (struct cmd *) 0)
+	printf ("?Invalid help command %s\n", arg);
+      else
+	printf ("%s\n", c->help);
+    }
+}
+
+void
+settrace (int argc, char **argv)
+{
+  trace = !trace;
+  printf ("Packet tracing %s.\n", trace ? "on" : "off");
+}
+
+void
+setverbose (int argc, char **argv)
+{
+  verbose = !verbose;
+  printf ("Verbose mode %s.\n", verbose ? "on" : "off");
+}
+
 /*
  * Send the requested file.
  */

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

Summary of changes:
 ChangeLog                              |  126 ++++
 Makefile.am                            |    9 +-
 configure.ac                           |   33 +-
 headers/Makefile.am                    |   20 -
 hostname/.gitignore                    |    1 -
 hostname/Makefile.am                   |   27 -
 inetd/.gitignore                       |    2 -
 inetd/Makefile.am                      |   34 -
 libinetutils/Makefile.am               |    4 +-
 {headers => libinetutils}/shishi_def.h |    0
 {headers => libinetutils}/tftpsubs.h   |    0
 logger/.gitignore                      |    2 -
 logger/Makefile.am                     |   27 -
 man/Makefile.am                        |   48 +-
 rcp/.gitignore                         |    1 -
 rcp/Makefile.am                        |   46 --
 rexec/.gitignore                       |    1 -
 rexec/Makefile.am                      |   34 -
 rexecd/.gitignore                      |    1 -
 rexecd/Makefile.am                     |   35 -
 rlogin/.gitignore                      |    1 -
 rlogin/Makefile.am                     |   42 --
 rlogind/.gitignore                     |    1 -
 rlogind/Makefile.am                    |   36 -
 rsh/.gitignore                         |    1 -
 rsh/Makefile.am                        |   46 --
 rshd/.gitignore                        |    1 -
 rshd/Makefile.am                       |   34 -
 src/.gitignore                         |   15 +
 src/Makefile.am                        |  139 ++++
 {hostname => src}/hostname.c           |    0
 {inetd => src}/inetd.c                 |   78 +-
 {logger => src}/logger.c               |   26 +-
 {rcp => src}/rcp.c                     |    6 +-
 {rexec => src}/rexec.c                 |    0
 {rexecd => src}/rexecd.c               |    1 -
 {rlogin => src}/rlogin.c               |    2 +-
 {rlogind => src}/rlogind.c             |    8 +-
 {rsh => src}/rsh.c                     |    2 +-
 {rshd => src}/rshd.c                   |    7 +-
 {syslogd => src}/syslogd.c             |    0
 src/tftp.c                             | 1220 ++++++++++++++++++++++++++++++++
 {tftpd => src}/tftpd.c                 |    6 +-
 {traceroute => src}/traceroute.c       |   28 +-
 {uucpd => src}/uucpd.c                 |    0
 syslogd/.gitignore                     |    2 -
 syslogd/Makefile.am                    |   35 -
 tftp/.gitignore                        |    1 -
 tftp/Makefile.am                       |   30 -
 tftp/extern.h                          |   52 --
 tftp/main.c                            |  809 ---------------------
 tftp/tftp.c                            |  486 -------------
 tftpd/.gitignore                       |    1 -
 tftpd/Makefile.am                      |   30 -
 traceroute/.gitignore                  |    1 -
 traceroute/Makefile.am                 |   42 --
 uucpd/.gitignore                       |    1 -
 uucpd/Makefile.am                      |   35 -
 58 files changed, 1629 insertions(+), 2047 deletions(-)
 delete mode 100644 headers/Makefile.am
 delete mode 100644 hostname/.gitignore
 delete mode 100644 hostname/Makefile.am
 delete mode 100644 inetd/.gitignore
 delete mode 100644 inetd/Makefile.am
 rename {headers => libinetutils}/shishi_def.h (100%)
 rename {headers => libinetutils}/tftpsubs.h (100%)
 delete mode 100644 logger/.gitignore
 delete mode 100644 logger/Makefile.am
 delete mode 100644 rcp/.gitignore
 delete mode 100644 rcp/Makefile.am
 delete mode 100644 rexec/.gitignore
 delete mode 100644 rexec/Makefile.am
 delete mode 100644 rexecd/.gitignore
 delete mode 100644 rexecd/Makefile.am
 delete mode 100644 rlogin/.gitignore
 delete mode 100644 rlogin/Makefile.am
 delete mode 100644 rlogind/.gitignore
 delete mode 100644 rlogind/Makefile.am
 delete mode 100644 rsh/.gitignore
 delete mode 100644 rsh/Makefile.am
 delete mode 100644 rshd/.gitignore
 delete mode 100644 rshd/Makefile.am
 create mode 100644 src/.gitignore
 create mode 100644 src/Makefile.am
 rename {hostname => src}/hostname.c (100%)
 rename {inetd => src}/inetd.c (99%)
 rename {logger => src}/logger.c (99%)
 rename {rcp => src}/rcp.c (99%)
 rename {rexec => src}/rexec.c (100%)
 rename {rexecd => src}/rexecd.c (99%)
 rename {rlogin => src}/rlogin.c (99%)
 rename {rlogind => src}/rlogind.c (99%)
 rename {rsh => src}/rsh.c (99%)
 rename {rshd => src}/rshd.c (99%)
 rename {syslogd => src}/syslogd.c (100%)
 create mode 100644 src/tftp.c
 rename {tftpd => src}/tftpd.c (99%)
 rename {traceroute => src}/traceroute.c (98%)
 rename {uucpd => src}/uucpd.c (100%)
 delete mode 100644 syslogd/.gitignore
 delete mode 100644 syslogd/Makefile.am
 delete mode 100644 tftp/.gitignore
 delete mode 100644 tftp/Makefile.am
 delete mode 100644 tftp/extern.h
 delete mode 100644 tftp/main.c
 delete mode 100644 tftp/tftp.c
 delete mode 100644 tftpd/.gitignore
 delete mode 100644 tftpd/Makefile.am
 delete mode 100644 traceroute/.gitignore
 delete mode 100644 traceroute/Makefile.am
 delete mode 100644 uucpd/.gitignore
 delete mode 100644 uucpd/Makefile.am


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Wed Jan 13 04:23:13 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NUzRZ-0005Ef-Dj
	for mharc-commit-inetutils@gnu.org; Wed, 13 Jan 2010 04:23:13 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NUzRX-0005EA-TA
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 04:23:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NUzRT-0005DN-P1
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 04:23:11 -0500
Received: from [199.232.76.173] (port=48125 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NUzRT-0005DK-JC
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 04:23:07 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:52772
	helo=internal.in.savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <simon@josefsson.org>) id 1NUzRT-0003g1-Al
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 04:23:07 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal with esmtp (Exim 4.69)
	(envelope-from <simon@josefsson.org>) id 1NUzRS-0006Xw-Uo
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 09:23:06 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1NUzRS-0001fe-R9
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 09:23:06 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c705eebed68fbc17382ab15e6c16a9de47bc510e
X-Git-Newrev: 1ec6b6ac6e5fa39bfab8a13d0694d322d8b7d74b
Message-Id: <E1NUzRS-0001fe-R9@vcs-noshell.in.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 13 Jan 2010 09:23:06 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_7-23-g1ec6b6a
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jan 2010 09:23:12 -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  1ec6b6ac6e5fa39bfab8a13d0694d322d8b7d74b (commit)
      from  c705eebed68fbc17382ab15e6c16a9de47bc510e (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=1ec6b6ac6e5fa39bfab8a13d0694d322d8b7d74b


commit 1ec6b6ac6e5fa39bfab8a13d0694d322d8b7d74b
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Jan 13 10:23:00 2010 +0100

    README: Update.

diff --git a/ChangeLog b/ChangeLog
index bd44e95..7b2071a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-13  Simon Josefsson  <simon@josefsson.org>
+
+	* README: Update.
+
 2010-01-12  Alfred M. Szmidt  <ams@gnu.org>
 
 	Moved single file programs to src/.
diff --git a/README b/README
index f854d04..ffafd99 100644
--- a/README
+++ b/README
@@ -41,13 +41,8 @@ override the values specified by --disable-clients or
 
 Notes:
 
-1) All the manpages will be installed, regardless of which programs
-   are built.  The whois server list will also be installed.  You can
-   use `make install-exec' instead of `make install' if you do not
-   want to install these files.
-
-2) All of the r* commands clients, rcp, rlogin, rsh, need to be
-   install setuid root to work correctly they use priviledge ports for
+1) All of the r* commands clients, rcp, rlogin, rsh, need to be
+   install setuid root to work correctly they use privileged ports for
    communication.
 
 Some known deficiencies:
@@ -58,3 +53,12 @@ Some known deficiencies:
 See the file INSTALL for installation instructions.
 
 Please send all bug reports to <bug-inetutils@gnu.org>.
+
+========================================================================
+
+Copyright (C) 1997-2010 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without any warranty.

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

Summary of changes:
 ChangeLog |    4 ++++
 README    |   18 +++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Wed Jan 13 04:26:55 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NUzV9-0006gp-L8
	for mharc-commit-inetutils@gnu.org; Wed, 13 Jan 2010 04:26:55 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NUzV7-0006fq-NG
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 04:26:53 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NUzV2-0006dT-UF
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 04:26:53 -0500
Received: from [199.232.76.173] (port=48180 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NUzV2-0006dL-QG
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 04:26:48 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:42360
	helo=internal.in.savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <simon@josefsson.org>) id 1NUzV2-0004dr-Bw
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 04:26:48 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal with esmtp (Exim 4.69)
	(envelope-from <simon@josefsson.org>) id 1NUzV1-0006bw-PD
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 09:26:47 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1NUzV1-0001qz-LN
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 09:26:47 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1ec6b6ac6e5fa39bfab8a13d0694d322d8b7d74b
X-Git-Newrev: 23fe7f9e2336c34e47932596b75b802ae1834127
Message-Id: <E1NUzV1-0001qz-LN@vcs-noshell.in.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 13 Jan 2010 09:26:47 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_7-24-g23fe7f9
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jan 2010 09:26:54 -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  23fe7f9e2336c34e47932596b75b802ae1834127 (commit)
      from  1ec6b6ac6e5fa39bfab8a13d0694d322d8b7d74b (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=23fe7f9e2336c34e47932596b75b802ae1834127


commit 23fe7f9e2336c34e47932596b75b802ae1834127
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Jan 13 10:26:44 2010 +0100

    TODO, THANKS: Update.

diff --git a/ChangeLog b/ChangeLog
index 7b2071a..0455c1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-01-13  Simon Josefsson  <simon@josefsson.org>
 
+	* TODO: Update.
+	* THANKS: Update.
 	* README: Update.
 
 2010-01-12  Alfred M. Szmidt  <ams@gnu.org>
diff --git a/THANKS b/THANKS
index 1801211..6119e33 100644
--- a/THANKS
+++ b/THANKS
@@ -10,8 +10,8 @@ In particular:
   Nathan Neulinger       (tftpd)
   Thomas Bushnell        (sockaddr sin_len field)
 
-Please see */ChangeLog for full credits.
-----------------------
+Please see ChangeLog for full credits.
+
 Email of contributors in alphabetical order:
 Alex Muntada 	   <alexm@ac.upc.es> 
 Bert De Knuydt	   <Bert.Deknuydt@esat.kuleuven.ac.be>
@@ -31,5 +31,14 @@ Michael Deutschmann <michael@talamasca.ocis.net>
 Michael Vogt       <mvogt@acm.org>
 Michael Weiser     <michael@weiser.saale-net.de>
 Sergey Poznyakoff  <gray@Mirddin.farlep.net>
-Simon Josefsson    <jas@extundo.com>
+Simon Josefsson    <simon@josefsson.org>
 Todd R. Eigenschink <todd@tekinteractive.com>
+
+========================================================================
+
+Copyright (C) 1997-2010 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without any warranty.
diff --git a/TODO b/TODO
index da569fd..c8f4b33 100644
--- a/TODO
+++ b/TODO
@@ -12,7 +12,7 @@ Function for parsing [USER@]HOSTNAME[:PORT], that returns each value
 in a structure.  Handle IP (v4 and v6) numbers as well.  And make
 programs use it.
 
-Files without a copyright notice: README, README-hacking, THANKS,
+Files without a copyright notice: README-hacking,
 TODO, confpaths.h.in, ifconfig/COMPATIBILITY, whois/as_del_list,
 whois/ip_del_list, whois/make_as_del.pl, whois/make_ip_del.pl,
 whois/make_tld_serv.pl, and whois/tld_serv_list.

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

Summary of changes:
 ChangeLog |    2 ++
 THANKS    |   15 ++++++++++++---
 TODO      |    2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Wed Jan 13 10:31:58 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NV5CQ-0004fT-7H
	for mharc-commit-inetutils@gnu.org; Wed, 13 Jan 2010 10:31:58 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NV5CO-0004ea-2P
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 10:31:56 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NV5CJ-0004ci-Qf
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 10:31:55 -0500
Received: from [199.232.76.173] (port=37155 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NV5CJ-0004cc-Kh
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 10:31:51 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:51838
	helo=internal.in.savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <simon@josefsson.org>) id 1NV5CJ-0008Rx-8n
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 10:31:51 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal with esmtp (Exim 4.69)
	(envelope-from <simon@josefsson.org>) id 1NV5CI-0003H4-A9
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 15:31:50 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1NV5CH-0002oc-W5
	for commit-inetutils@gnu.org; Wed, 13 Jan 2010 15:31:50 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 23fe7f9e2336c34e47932596b75b802ae1834127
X-Git-Newrev: 4b1d4704233377254a05d2dd830c77cb3e286b79
Message-Id: <E1NV5CH-0002oc-W5@vcs-noshell.in.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 13 Jan 2010 15:31:50 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_7-25-g4b1d470
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jan 2010 15:31:56 -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  4b1d4704233377254a05d2dd830c77cb3e286b79 (commit)
      from  23fe7f9e2336c34e47932596b75b802ae1834127 (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=4b1d4704233377254a05d2dd830c77cb3e286b79


commit 4b1d4704233377254a05d2dd830c77cb3e286b79
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Jan 13 16:31:43 2010 +0100

    Use gnulib getaddrinfo module.

diff --git a/ChangeLog b/ChangeLog
index 0455c1d..74c37c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-12  Simon Josefsson  <simon@josefsson.org>
+
+	* whois/whois.c (openconn) [!HAVE_GETADDRINFO]: Remove variables
+	hostinfo, servinfo, and saddr and supporting code.
+	* src/inetd.c (servtab): Remove !HAVE_GETADDRINFO support.
+	(setup) [!HAVE_GETADDRINFO]: Remove function.
+	(expand_enter) [!HAVE_GETADDRINFO]: Remove function.
+	* configure.ac: Remove HAVE_GETADDRINFO variable.  Don't check for
+	getaddrinfo.
+	* bootstrap.conf (gnulib_modules): Add getaddrinfo.
+
 2010-01-13  Simon Josefsson  <simon@josefsson.org>
 
 	* TODO: Update.
diff --git a/bootstrap.conf b/bootstrap.conf
index fca66cd..5483dbe 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -34,6 +34,7 @@ exitfail
 extensions
 fdl-1.3
 filemode
+getaddrinfo
 getcwd
 getline
 getopt-gnu
diff --git a/configure.ac b/configure.ac
index cfb8ef1..d234487 100644
--- a/configure.ac
+++ b/configure.ac
@@ -329,12 +329,6 @@ if test ! "X$ipv6" = "Xno" -a "X$working_ipv6" = "Xyes"; then
   AC_CHECK_TYPE(struct addrinfo, , working_ipv6=no, [#include <netdb.h>])
 fi
 
-AH_TEMPLATE([HAVE_GETADDRINFO],[Define to 1 if you have getaddrinfo(3)])
-AC_CHECK_FUNC(getaddrinfo,
-              [AC_DEFINE([HAVE_GETADDRINFO],1)],
-	      [working_ipv6=no
-	       AC_DEFINE([HAVE_GETADDRINFO],0)], [#include <netdb.h>])
-
 if test ! "X$ipv6" = "Xno" -a "X$working_ipv6" = "Xyes"; then
   AC_CHECK_FUNC(getnameinfo, ,working_ipv6=no, [#include <netdb.h>])
 fi
diff --git a/src/inetd.c b/src/inetd.c
index 72e232f..aa98a2c 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -267,11 +267,7 @@ struct servtab
   int se_type;			/* type */
   sa_family_t se_family;	/* address family of the socket */
   char se_v4mapped;		/* 1 = accept v4mapped connection, 0 = don't */
-#if HAVE_GETADDRINFO
   struct sockaddr_storage se_ctrladdr;	/* bound address */
-#else
-  struct sockaddr_in se_ctrladdr;	/* bound address */
-#endif
   unsigned se_refcnt;
   int se_count;			/* number started since se_time */
   struct timeval se_time;	/* start of se_count */
@@ -550,7 +546,6 @@ print_service (const char *action, struct servtab *sep)
 
 
 /* Configuration */
-#if HAVE_GETADDRINFO
 int
 setup (struct servtab *sep)
 {
@@ -631,56 +626,6 @@ setup (struct servtab *sep)
     }
   return 0;
 }
-#else
-void
-setup (struct servtab *sep)
-{
-  int err;
-  const int on = 1;
-
-  sep->se_fd = socket (sep->se_family, sep->se_socktype, 0);
-  if (sep->se_fd < 0)
-    {
-      if (debug)
-	fprintf (stderr, "socket failed on %s/%s: %s\n",
-		 sep->se_service, sep->se_proto, strerror (errno));
-      syslog (LOG_ERR, "%s/%s: socket: %m", sep->se_service, sep->se_proto);
-      return 1;
-    }
-
-  if (strncmp (sep->se_proto, "tcp", 3) == 0 && (options & SO_DEBUG))
-    {
-      err = setsockopt (sep->se_fd, SOL_SOCKET, SO_DEBUG,
-			(char *) &on, sizeof (on));
-      if (err < 0)
-	syslog (LOG_ERR, "setsockopt (SO_DEBUG): %m");
-    }
-
-  err = setsockopt (sep->se_fd, SOL_SOCKET, SO_REUSEADDR,
-		    (char *) &on, sizeof (on));
-  if (err < 0)
-    syslog (LOG_ERR, "setsockopt (SO_REUSEADDR): %m");
-
-  err = bind (sep->se_fd, (struct sockaddr *) &sep->se_ctrladdr,
-	      sizeof (sep->se_ctrladdr));
-  if (err < 0)
-    {
-      if (debug)
-	fprintf (stderr, "bind failed on %s/%s: %s\n",
-		 sep->se_service, sep->se_proto, strerror (errno));
-      syslog (LOG_ERR, "%s/%s: bind: %m", sep->se_service, sep->se_proto);
-      close (sep->se_fd);
-      sep->se_fd = -1;
-      if (!timingout)
-	{
-	  timingout = 1;
-	  alarm (RETRYTIME);
-	}
-      return 1;
-    }
-  return 0;
-}
-#endif
 
 void
 servent_setup (struct servtab *sep)
@@ -802,7 +747,6 @@ enter (struct servtab *cp)
   return sep;
 }
 
-#if HAVE_GETADDRINFO
 int
 inetd_getaddrinfo (struct servtab *sep, int proto, struct addrinfo **result)
 {
@@ -879,67 +823,6 @@ expand_enter (struct servtab *sep)
 
   return 0;
 }
-#else
-int
-expand_enter (struct servtab *sep)
-{
-  struct servent *sp;
-
-  sp = getservbyname (sep->se_service, sep->se_proto);
-  if (sp == 0)
-    {
-      static struct servent servent;
-      char *p;
-      unsigned long val;
-      unsigned short port;
-
-      val = strtoul (sep->se_service, &p, 0);
-      if (*p || (port = val) != val)
-	{
-	  syslog (LOG_ERR, "%s/%s: unknown service",
-		  sep->se_service, sep->se_proto);
-	  sep->se_checked = 0;
-	  return 1;
-	}
-      servent.s_port = htons (port);
-      sp = &servent;
-    }
-  if (sp->s_port != sep->se_ctrladdr.sin_port)
-    {
-      sep->se_ctrladdr.sin_family = AF_INET;
-      sep->se_ctrladdr.sin_port = sp->s_port;
-    }
-  if (sep->se_node == NULL)
-    {
-      cp = enter (sep);
-      servent_setup (cp);
-    }
-  else
-    {
-      char    **p;
-      struct hostent *host = gethostbyname (sep->se_node);
-      if (!host)
-	{
-	  syslog (LOG_ERR, "%s/%s: unknown host %s",
-		  sep->se_service, sep->se_proto, sep->se_node);
-	  return 1;
-	}
-      if (host->h_addrtype != AF_INET)
-	{
-	  syslog (LOG_ERR, "%s/%s: unsupported address family %d",
-		  sep->se_service, sep->se_proto, host->h_addrtype);
-	  return 1;
-	}
-      for (p = host->h_addr_list; *p; p++)
-	{
-	  memcpy (&sep->se_ctrladdr.sin_addr.s_addr, *p, host->h_length);
-	  cp = enter (sep);
-	  servent_setup (cp);
-	}
-    }
-  return 0;
-}
-#endif
 
 
 /* Configuration parser */
diff --git a/whois/whois.c b/whois/whois.c
index 9552564..0152d72 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -558,16 +558,9 @@ int
 openconn (const char *server, const char *port)
 {
   int fd;
-#ifdef HAVE_GETADDRINFO
   int i;
   struct addrinfo hints, *res, *ressave;
-#else
-  struct hostent *hostinfo;
-  struct servent *servinfo;
-  struct sockaddr_in saddr;
-#endif
 
-#ifdef HAVE_GETADDRINFO
   memset (&hints, 0, sizeof (struct addrinfo));
   hints.ai_family = AF_UNSPEC;
   hints.ai_socktype = SOCK_STREAM;
@@ -588,27 +581,6 @@ openconn (const char *server, const char *port)
   if (!res)
     err_sys ("connect");
   freeaddrinfo (ressave);
-#else
-  if ((hostinfo = gethostbyname (server)) == NULL)
-    err_quit (_("Host %s not found."), server);
-  if ((fd = socket (PF_INET, SOCK_STREAM, IPPROTO_IP)) < 0)
-    err_sys ("socket");
-  memset (&saddr, 0, sizeof (saddr));
-  saddr.sin_addr = *(struct in_addr *) hostinfo->h_addr;
-  saddr.sin_family = AF_INET;
-  if (!port)
-    {
-      saddr.sin_port = htons (43);
-    }
-  else if ((saddr.sin_port = htons (atoi (port))) == 0)
-    {
-      if ((servinfo = getservbyname (port, "tcp")) == NULL)
-	err_quit (_("%s/tcp: unknown service"), port);
-      saddr.sin_port = servinfo->s_port;
-    }
-  if (connect (fd, &saddr, sizeof (saddr)) < 0)
-    err_sys ("connect");
-#endif
   return (fd);
 }
 

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

Summary of changes:
 ChangeLog      |   11 +++++
 bootstrap.conf |    1 +
 configure.ac   |    6 ---
 src/inetd.c    |  117 --------------------------------------------------------
 whois/whois.c  |   28 -------------
 5 files changed, 12 insertions(+), 151 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Wed Jan 27 14:52:09 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NaDvt-00036a-Qu
	for mharc-commit-inetutils@gnu.org; Wed, 27 Jan 2010 14:52:09 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NaDvr-00036A-E8
	for commit-inetutils@gnu.org; Wed, 27 Jan 2010 14:52:07 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NaDvm-00035P-Gy
	for commit-inetutils@gnu.org; Wed, 27 Jan 2010 14:52:06 -0500
Received: from [199.232.76.173] (port=36088 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NaDvm-00035G-B7
	for commit-inetutils@gnu.org; Wed, 27 Jan 2010 14:52:02 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:41459
	helo=internal.in.savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gray@gnu.org.ua>) id 1NaDvl-0000g7-Bw
	for commit-inetutils@gnu.org; Wed, 27 Jan 2010 14:52:01 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal with esmtp (Exim 4.69) (envelope-from <gray@gnu.org.ua>)
	id 1NaDvk-0005Uh-TY
	for commit-inetutils@gnu.org; Wed, 27 Jan 2010 19:52:00 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gray@savannah.gnu.org>) id 1NaDvk-0004nx-Eu
	for commit-inetutils@gnu.org; Wed, 27 Jan 2010 19:52:00 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4b1d4704233377254a05d2dd830c77cb3e286b79
X-Git-Newrev: bd081e76a1cc46522a32a1fe68d4a369cebeca84
Message-Id: <E1NaDvk-0004nx-Eu@vcs-noshell.in.savannah.gnu.org>
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Wed, 27 Jan 2010 19:52:00 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_7-26-gbd081e7
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2010 19:52:08 -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  bd081e76a1cc46522a32a1fe68d4a369cebeca84 (commit)
      from  4b1d4704233377254a05d2dd830c77cb3e286b79 (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=bd081e76a1cc46522a32a1fe68d4a369cebeca84


commit bd081e76a1cc46522a32a1fe68d4a369cebeca84
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Wed Jan 27 21:45:05 2010 +0200

    Implement setting interface options in ifconfig: up, down, multicast, allmulti, etc.
    
    * ifconfig/changeif.c (set_flags): New function.
    (configure_if): Set flags.
    * ifconfig/flags.c (struct if_flag): New member `rev'.
    (if_flagtoname) Avoid extra comparison.
    (if_nametoflag): Rewrite. Take 2 additional arguments.
    (if_nameztoflag): New function.
    (if_format_flags): New function.
    * ifconfig/flags.h (if_nametoflag): Change signature.
    (if_nameztoflag): New prototype.
    * ifconfig/options.c (all_option): New global.
    (argp_options): Use -A as short option for --address.
    Add new option -a (--all).
    New options: --up, --down, --flags.
    (parse_opt_set_flag, parse_opt_flag_list): New functions.
    (parse_opt_set_point_to_point): New function.
    (parse_opt): Handle new options.
    (argp): Add help filter.
    * ifconfig/options.h (struct ifconfig): New members: setflags
    and clrflags.
    (parse_opt_set_flag, parse_opt_flag_list)
    (parse_opt_set_point_to_point): New prototypes.
    * ifconfig/printif.c (fh_brdaddr_query, fh_dstaddr_query): Update
    calls to if_nametoflag.
    * ifconfig/system/linux.c (system_help): Update.
    (system_parse_opt_rest): Allow for flags (up, down, arp, etc.)

diff --git a/ChangeLog b/ChangeLog
index 74c37c0..07a222e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2010-01-27  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	Implement setting interface options: up, down, multicast,
+	allmulti.
+
+	* ifconfig/changeif.c (set_flags): New function.
+	(configure_if): Set flags.
+	* ifconfig/flags.c (struct if_flag): New member `rev'.
+	(if_flagtoname) Avoid extra comparison.
+	(if_nametoflag): Rewrite. Take 2 additional arguments.
+	(if_nameztoflag): New function.
+	(if_format_flags): New function.
+	* ifconfig/flags.h (if_nametoflag): Change signature.
+	(if_nameztoflag): New prototype.
+	* ifconfig/options.c (all_option): New global.
+	(argp_options): Use -A as short option for --address.
+	Add new option -a (--all).
+	New options: --up, --down, --flags.
+	(parse_opt_set_flag, parse_opt_flag_list): New functions.
+	(parse_opt_set_point_to_point): New function.
+	(parse_opt): Handle new options.
+	(argp): Add help filter.
+	* ifconfig/options.h (struct ifconfig): New members: setflags
+	and clrflags.
+	(parse_opt_set_flag, parse_opt_flag_list)
+	(parse_opt_set_point_to_point): New prototypes.
+	* ifconfig/printif.c (fh_brdaddr_query, fh_dstaddr_query): Update
+	calls to if_nametoflag.
+	* ifconfig/system/linux.c (system_help): Update.
+	(system_parse_opt_rest): Allow for flags (up, down, arp, etc.)
+
 2010-01-12  Simon Josefsson  <simon@josefsson.org>
 
 	* whois/whois.c (openconn) [!HAVE_GETADDRINFO]: Remove variables
@@ -1021,7 +1052,7 @@
 	* ping/ping_timestamp.c: Likewise.
 
 2009-07-10  Giuseppe Scrivano <gscrivano@gnu.org>
-            Alfred M. Szmidt <ams@gnu.org>
+	    Alfred M. Szmidt <ams@gnu.org>
 
 	* rexecd/rexecd.c: Use EXIT_FAILURE consistently for calls to
 	error.
@@ -1402,7 +1433,7 @@
 
 2008-10-14  Rakesh Pandit  <rakesh.pandit@gmail.com>
 
-        * ping/ping_impl.h, ping/ping.h, ping/ping_common.h,
+	* ping/ping_impl.h, ping/ping.h, ping/ping_common.h,
 	ping/ping6.h (ping_stat, PEV_RESPONSE, PEV_DUPLICATE, PEV_NOECHO,
 	PING_INTERVAL, PING_CKTABSIZE, MAXWAIT, OPT_FLOOD, OPT_INTERVAL,
 	OPT_NUMERIC, OPT_QUIET, OPT_RROUTE, OPT_VERBOSE, PING_TIMING,
@@ -1485,7 +1516,7 @@
 	from list
 
 	* doc/Makefile.am (SUBDIRS): Remove variable.
-        * doc/rfc/.cvsignore, doc/rfc/Makefile.am, doc/rfc/rfc1282.txt:
+	* doc/rfc/.cvsignore, doc/rfc/Makefile.am, doc/rfc/rfc1282.txt:
 	Files removed.
 
 2008-09-26  Arash Yadegarnia <arash@bluehome.net> (tiny change)
@@ -1500,7 +1531,7 @@
 
 2008-09-26  Alfred M. Szmidt  <ams@gnu.org>
 
-        * doc/inetutils.texi: Refer to `COMMAND invocation' nodes for
+	* doc/inetutils.texi: Refer to `COMMAND invocation' nodes for
 	logger, rcp, rexecd and syslogd.  Formating fixes.  Mention
 	traceroute in the TOC.
 
@@ -2561,7 +2592,7 @@
 
 2006-04-20  Sergey Poznyakoff  <gray@gnu.org.ua>
 
- 	* Makefile.am (INCLUDES): Add -I$(top_srcdir)/libinetutils
+	* Makefile.am (INCLUDES): Add -I$(top_srcdir)/libinetutils
 	* ftpd/extern.h (logwtmp): Remove prototype
 	* ftpd/ftpd.c: Include libinetutils.h
 
@@ -3775,11 +3806,11 @@
 	Minor bugfix: LIBS and LDFLAGS were not properly
 	restored.
 	* configure.ac: Removed KERBEROS_IV and KERBEROS_V defines.
-        Added check for socklen_t.
+	Added check for socklen_t.
 
 2003-02-08  Simon Josefsson  <jas@extundo.com>
 
-        * telnet/commands.c (tn): Don't set hostname to DNS canonicalized
+	* telnet/commands.c (tn): Don't set hostname to DNS canonicalized
 	  value. Attackers may control DNS and fool the Kerberos
 	  authentication code to use the wrong realm for the server, and
 	  consequently the wrong KDC for the server, which the attackers
@@ -3909,7 +3940,7 @@
 	  switching to the user privileges. Thanks to
 	  Alex Muntada <alexm@ac.upc.es> for the idea.
 	  Removed unneded casts to (void).
-          Create a local copy of hostname, lest it be spoiled
+	  Create a local copy of hostname, lest it be spoiled
 	  by a call to localhost().
 	  Thanks to Chris Ulherr for reporting.
 
@@ -3917,7 +3948,7 @@
 
 	* rexecd/rexecd.c: Change to the user's directory after
 	  switching to the user privileges. Thanks to
-          Alex Muntada <alexm@ac.upc.es> for the idea.
+	  Alex Muntada <alexm@ac.upc.es> for the idea.
 	  Removed unneded casts to (void).
 
 2002-09-06  Sergey Poznyakoff  <gray@Noldor.runasimi.org>
@@ -4358,16 +4389,16 @@
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-        * ftpd/Makefile.am (inetdaemon_PROGRAMS): Use ftpd_BUILD instead of
-        BUILD_FTPD.
-        * ftpd/extern.h [HAVE_GETUSERSHELL_DECL]: Renamed to HAVE_DECL_GETUSERSHELL.
-        * ftpd/ftpd.c [HAVE_FCLOSE_DECL]: Renamed to HAVE_DECL_FCLOSE.
+	* ftpd/Makefile.am (inetdaemon_PROGRAMS): Use ftpd_BUILD instead of
+	BUILD_FTPD.
+	* ftpd/extern.h [HAVE_GETUSERSHELL_DECL]: Renamed to HAVE_DECL_GETUSERSHELL.
+	* ftpd/ftpd.c [HAVE_FCLOSE_DECL]: Renamed to HAVE_DECL_FCLOSE.
 
 2002-04-21  Alfred M. Szmidt <ams@kemisten.nu>
 
-        * ftp/Makefile.am (bin_PROGRAMS): Use ftp_BUILD instead of BUILD_FTP.
-        * ftp/ftp.c [HAVE_FCLOSE_DECL]: Renamed to HAVE_DECL_FCLOSE.
-        [HAVE_PCLOSE_DECL]: Renamed to HAVE_DECL_PCLOSE.
+	* ftp/Makefile.am (bin_PROGRAMS): Use ftp_BUILD instead of BUILD_FTP.
+	* ftp/ftp.c [HAVE_FCLOSE_DECL]: Renamed to HAVE_DECL_FCLOSE.
+	[HAVE_PCLOSE_DECL]: Renamed to HAVE_DECL_PCLOSE.
 
 2002-04-21  Alfred M. Szmidt  <ams@kemisten.nu>
 
@@ -4439,7 +4470,7 @@
 	* telnetd/ext.h: Removed.
 	* telnetd/global.c: Removed.
 	* telnetd/authenc.c: Removed.
-        * telnetd/sys_term.c: Removed
+	* telnetd/sys_term.c: Removed
 	* telnetd/term.c: (new) Terminal-specific functions.
 	* telnetd/Makefile.am: Modified.
 	* telnetd/telnetd.c: Rewritten.
@@ -4493,7 +4524,7 @@
 	* telnetd/Makefile.am: Added pty.c
 	* telnetd/ext.h: Changed definition of line.
 	* telnetd/sys_term.c: Removed unneeded functions. Some of them
-          are re-implemented in pty.c
+	  are re-implemented in pty.c
 	* telnetd/telnetd.c (doit, telnet, readstream): Reorganized.
 
 2002-03-14  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
@@ -4644,13 +4675,13 @@
 
 	* autogen.sh: Don't point autoheader to headers/
 
-        * headers/acconfig.h: Move to ...
+	* headers/acconfig.h: Move to ...
 	* acconfig.h: Here
 
 	* Makefile.am: Require Automake 1.5.  Add doc and doc/rfc to
 	build tree.  Don't tell autoheader to look in headers/
 
-        I moved config.h to the top_builddir to overcome a bug in
+	I moved config.h to the top_builddir to overcome a bug in
 	autoconf that requires the config.h to be in the same
 	directory as aclocal.m4
 
@@ -4681,7 +4712,7 @@
 2001-11-22  Sergey Poznyakoff
 
 	* rlogin/rlogin.c: Fixed syntax error: sizeof int. Should be:
-        sizeof(int).
+	sizeof(int).
 
 2001-11-22  Sergey Poznyakoff
 
@@ -5195,7 +5226,7 @@
 
 2001-08-11  Sergey Poznyakoff  <gray@farlep.net>
 
-        * icmp.h: Fixed coding style to comply with GNU.
+	* icmp.h: Fixed coding style to comply with GNU.
 	* libicmp/icmp_address.c: Likewise.
 	* libicmp/icmp_cksum.c: Likewise.
 	* libicmp/icmp_echo.c: Likewise.
@@ -5388,7 +5419,7 @@
 
 	Patches by Alain:
 	* ping/ping_address.c, ping/ping_echo.c, ping/ping_router.c,
-	ping/ping_timestamp.c: 	<signal.h> -> <sys/signal.h>
+	ping/ping_timestamp.c:	<signal.h> -> <sys/signal.h>
 
 
 2001-06-20  Sergey Poznyakoff  <gray@farlep.net>
@@ -5497,12 +5528,12 @@
 
 2001-06-05  Sergey Poznyakoff  <gray@farlep.net>
 
-        * ftpd/ftpd.c: MAP_FAILED is not defined on some systems
+	* ftpd/ftpd.c: MAP_FAILED is not defined on some systems
 	(e.g. Solaris, SunOS)
-        * headers/paths.h: Added missing _PATH_LOGCONF, _PATH_LOGPID,
-        _PATH_LOG
-        * libls/print.c: Provided defaults for major() and minor() macros
-        for systems lacking them.
+	* headers/paths.h: Added missing _PATH_LOGCONF, _PATH_LOGPID,
+	_PATH_LOG
+	* libls/print.c: Provided defaults for major() and minor() macros
+	for systems lacking them.
 
 2001-06-04  Alain Magloire
 
@@ -7099,7 +7130,7 @@ AC_REPLACE_FUNC (setproctitle).
 	* ftp/ruserpass.c: MACH was define on Hurd.  We protect
 	the defines before using them, MACH was change to MACHINE.
 	Noted by the Hurd people(Bayley, Marcus)
-    	* cmds.c : use xgetcwd().
+	* cmds.c : use xgetcwd().
 
 1999-05-19 Alain Magloire
 
@@ -7402,7 +7433,7 @@ Mon May 20 13:29:32 MET DST 1996:  Miquel van Smoorenburg <miquels@cistron.nl>
 Added continuation line support.
 
 	* syslogd/syslogd.c (init): Add support for continuated lines
-          (implemented by Miquel van Smoorenburg <miquels@cistron.nl>).
+	  (implemented by Miquel van Smoorenburg <miquels@cistron.nl>).
 
 	* syslogd/syslog.conf.5: Mention continuated line feature.
 
diff --git a/ifconfig/changeif.c b/ifconfig/changeif.c
index 9848ab7..4f3bfae 100644
--- a/ifconfig/changeif.c
+++ b/ifconfig/changeif.c
@@ -189,6 +189,31 @@ set_metric (int sfd, struct ifreq *ifr, int metric)
 }
 
 int
+set_flags (int sfd, struct ifreq *ifr, int setflags, int clrflags)
+{
+#if !defined (SIOCGIFFLAGS) || !defined (SIOCSIFFLAGS)
+  error (0, 0,
+         "don't know how to set the interface flags on this system");
+  return -1;
+#else
+  struct ifreq tifr = *ifr;
+
+  if (ioctl (sfd, SIOCGIFFLAGS, &tifr) < 0)
+    {
+      error (0, errno, "SIOCGIFFLAGS failed");
+      return -1;
+    }
+  ifr->ifr_flags = (tifr.ifr_flags | setflags) & ~clrflags;
+  if (ioctl (sfd, SIOCSIFFLAGS, ifr) < 0)
+    {
+      error (0, errno, "SIOCSIFFLAGS failed");
+      return -1;
+    }
+  return 0;
+#endif
+}
+
+int
 configure_if (int sfd, struct ifconfig *ifp)
 {
   int err = 0;
@@ -212,6 +237,8 @@ configure_if (int sfd, struct ifconfig *ifp)
     err = set_metric (sfd, &ifr, ifp->metric);
   if (!err && ifp->valid & IF_VALID_SYSTEM)
     err = system_configure (sfd, &ifr, ifp->system);
+  if (!err && (ifp->setflags || ifp->clrflags))
+    err = set_flags (sfd, &ifr, ifp->setflags, ifp->clrflags);
   if (!err && ifp->valid & IF_VALID_FORMAT)
     print_interface (sfd, ifp->name, &ifr, ifp->format);
   return err;
diff --git a/ifconfig/flags.c b/ifconfig/flags.c
index 78870bf..c948cea 100644
--- a/ifconfig/flags.c
+++ b/ifconfig/flags.c
@@ -34,7 +34,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>
+#include <stdlib.h>
 #include "ifconfig.h"
+#include "xalloc.h"
 
 /* Conversion table for interface flag names.
    The mask must be a power of 2.  */
@@ -42,6 +44,7 @@ struct if_flag
 {
   const char *name;
   int mask;
+  int rev;
 } if_flags[] =
   {
     /* Available on all systems which derive the network interface from
@@ -68,6 +71,7 @@ struct if_flag
 #endif
 #ifdef IFF_NOARP		/* No address resolution protocol.  */
     {"NOARP", IFF_NOARP},
+    {"ARP", IFF_NOARP, 1},
 #endif
 #ifdef IFF_PROMISC		/* Receive all packets.  */
     {"PROMISC", IFF_PROMISC},
@@ -83,6 +87,7 @@ struct if_flag
 #ifdef IFF_NOTRAILERS		/* Avoid use of trailers.  */
     /* Obsoleted on FreeBSD systems.  */
     {"NOTRAILERS", IFF_NOTRAILERS},
+    {"TRAILERS", IFF_NOTRAILERS, 1},
 #endif
     /* Available on GNU and Linux systems.  */
 #ifdef IFF_MASTER		/* Master of a load balancer.  */
@@ -148,6 +153,7 @@ struct if_flag
     /* Available on HP-UX 10.20 systems.  */
 #ifdef IFF_NOTRAILERS		/* Avoid use of trailers.  */
     {"NOTRAILERS", IFF_NOTRAILERS},
+    {"TRAILERS", IFF_NOTRAILERS, 1},
 #endif
 #ifdef IFF_LOCALSUBNETS		/* Subnets of this net are local.  */
     {"LOCALSUBNETS", IFF_LOCALSUBNETS},
@@ -157,12 +163,14 @@ struct if_flag
 #endif
 #ifdef IFF_NOACC		/* No data access on outbound.  */
     {"NOACC", IFF_NOACC},
+    {"ACC", IFF_NOACC, 1},
 #endif
 #ifdef IFF_OACTIVE		/* Transmission in progress.  */
     {"OACTIVE", IFF_OACTIVE},
 #endif
 #ifdef IFF_NOSR8025		/* No source route 802.5.  */
     {"NOSR8025", IFF_NOSR8025},
+    {"SR8025", IFF_NOSR8025, 1},
 #endif
 #ifdef IFF_CKO_ETC		/* Interface supports trailer checksum.  */
     {"CKO_ETC", IFF_CKO_ETC},
@@ -191,6 +199,7 @@ struct if_flag
 #endif
 #ifdef IFF_NOCHECKSUM		/* No checksums needed (reliable media).  */
     {"NOCHECKSUM", IFF_NOCHECKSUM},
+    {"CHECKSUM", IFF_NOCHECKSUM, 1},
 #endif
 #ifdef IFF_MULTINET		/* Multiple networks on interface.  */
     {"MULTINET", IFF_MULTINET},
@@ -217,27 +226,100 @@ struct if_flag
 #endif
   };
 
+static int
+cmpname (const void *a, const void *b)
+{
+  return strcmp (*(const char**)a, *(const char**)b);
+}
+
+char *
+if_format_flags (const char *prefix)
+{
+  size_t len = 0;
+  struct if_flag *fp;
+  char **fnames;
+  size_t i, fcount;
+  char *str, *p;
+
+  for (fp = if_flags, len = 0, fcount = 0; fp->name; fp++)
+    if (!fp->rev)
+      {
+	fcount++;
+	len += strlen (fp->name) + 1;
+      }
+
+  fcount = sizeof (if_flags) / sizeof (if_flags[0]) - 1;
+  fnames = xmalloc (fcount * sizeof (fnames[0]) + len);
+  p = (char*)(fnames + fcount);
+
+  for (fp = if_flags, i = 0; fp->name; fp++)
+    if (!fp->rev)
+      {
+	const char *q;
+
+	fnames[i++] = p;
+	q = fp->name;
+	if (strncmp (q, "NO", 2) == 0)
+	  q += 2;
+	for (; *q; q++)
+	  *p++ = tolower (*q);
+	*p++ = 0;
+      }
+  fcount = i;
+  qsort (fnames, fcount, sizeof (fnames[0]), cmpname);
+
+  len += 2 * fcount;
+
+  if (prefix)
+    len += strlen (prefix);
+
+  str = xmalloc (len + 1);
+  p = str;
+  if (prefix)
+    {
+      strcpy (p, prefix);
+      p += strlen (prefix);
+    }
+
+  for (i = 0; i < fcount; i++)
+    {
+      if (i && strcmp (fnames[i - 1], fnames[i]) == 0)
+	continue;
+      strcpy (p, fnames[i]);
+      p += strlen (fnames[i]);
+      if (++i < fcount)
+	{
+	  *p++ = ',';
+	  *p++ = ' ';
+	}
+      else
+	break;
+    }
+  *p = 0;
+  free (fnames);
+  return str;
+}
+
 /* Return the name corresponding to the interface flag FLAG.
    If FLAG is unknown, return NULL.
-   AVOID contains a ':' surrounded and seperated list of flag names
+   AVOID contains a ':' surrounded and separated list of flag names
    that should be avoided if alternative names with the same flag value
    exists.  The first unavoided match is returned, or the first avoided
    match if no better is available.  */
 const char *
 if_flagtoname (int flag, const char *avoid)
 {
-  struct if_flag *fp = if_flags;
+  struct if_flag *fp;
   const char *first_match = NULL;
   char *start;
 
-  while (fp->name)
+  for (fp = if_flags; ; fp++)
     {
-      if (flag == fp->mask)
+      if (!fp->name)
+	return NULL;
+      if (flag == fp->mask && !fp->rev)
 	break;
-      fp++;
     }
-  if (!fp->name)
-    return NULL;
 
   first_match = fp->name;
 
@@ -259,17 +341,40 @@ if_flagtoname (int flag, const char *avoid)
     return first_match;
 }
 
-/* Return the flag mask corresponding to flag name NAME.  If no flag
-   with this name is found, return 0.  */
 int
-if_nametoflag (const char *name)
+if_nametoflag (const char *name, size_t len, int *prev)
 {
-  struct if_flag *fp = if_flags;
+  struct if_flag *fp;
+  int rev = 0;
+
+  if (len > 1 && name[0] == '-')
+    {
+      name++;
+      len--;
+      rev = 1;
+    }
+  else if (len > 2 && strncasecmp (name, "NO", 2) == 0)
+    {
+      name += 2;
+      len -= 2;
+      rev = 1;
+    }
 
-  while (fp->name && strcasecmp (name, fp->name))
-    fp++;
+  for (fp = if_flags; fp->name; fp++)
+    {
+      if (strncasecmp (fp->name, name, len) == 0)
+	{
+	  *prev = fp->rev ^ rev;
+	  return fp->mask;
+	}
+    }
+  return 0;
+}
 
-  return fp->mask;
+int
+if_nameztoflag (const char *name, int *prev)
+{
+  return if_nametoflag (name, strlen (name), prev);
 }
 
 /* Print the flags in FLAGS, using AVOID as in if_flagtoname, and
diff --git a/ifconfig/flags.h b/ifconfig/flags.h
index 516efae..713cf1c 100644
--- a/ifconfig/flags.h
+++ b/ifconfig/flags.h
@@ -44,11 +44,14 @@ const char *if_flagtoname (int flag, const char *avoid);
 
 /* Return the flag mask corresponding to flag name NAME.  If no flag
    with this name is found, return 0.  */
-int if_nametoflag (const char *name);
+int if_nametoflag (const char *name, size_t len, int *prev);
+int if_nameztoflag (const char *name, int *prev);
 
 /* Print the flags in FLAGS, using AVOID as in if_flagtoname, and
    SEPERATOR between individual flags.  Returns the number of
    characters printed.  */
 int print_if_flags (int flags, const char *avoid, char seperator);
 
+char *if_format_flags (const char *prefix);
+
 #endif
diff --git a/ifconfig/options.c b/ifconfig/options.c
index 0ee1921..6064fe7 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -146,33 +146,45 @@ struct format formats[] = {
 
 /* Default format.  */
 const char *default_format;
+/* Display all interfaces, even if down */
+int all_option;
 
 enum {
   METRIC_OPTION = 256,
-  FORMAT_OPTION
+  FORMAT_OPTION,
+  UP_OPTION,
+  DOWN_OPTION,
 };
 
 static struct argp_option argp_options[] = {
   { "verbose", 'v', NULL, 0,
     "output information when configuring interface" },
+  { "all", 'a', NULL, 0,
+    "display all available interfaces" },
   { "interface", 'i', "NAME", 0,
     "configure network interface NAME" },
-  { "address", 'a', "ADDR", 0,
+  { "address", 'A', "ADDR", 0,
     "set interface address to ADDR" },
   { "netmask", 'm', "MASK", 0,
     "set netmask to MASK" },
   { "dstaddr", 'd', "ADDR", 0,
     "set destination (peer) address to ADDR" },
-  { "peer", 'p', NULL, OPTION_ALIAS },
+  { "peer", 'p', "ADDR", OPTION_ALIAS },
   { "broadcast", 'B', "ADDR", 0,
     "set broadcast address to ADDR" },
   { "brdaddr", 'b', NULL, OPTION_ALIAS, }, /* FIXME: Do we really need it? */
   { "mtu", 'M', "N", 0,
-    "et mtu of interface to N" },
+    "set mtu of interface to N" },
   { "metric", METRIC_OPTION, "N", 0,
     "set metric of interface to N" },
   { "format", FORMAT_OPTION, "FORMAT", 0,
     "select output format (or set back to default)" },
+  { "up", UP_OPTION, NULL, 0,
+    "activate the interface (default if address is given)" },
+  { "down", DOWN_OPTION, NULL, 0,
+    "shut the interface down" },
+  { "flags", 'F', "FLAG[,FLAG...]", 0,
+    "set interface flags" },
   { NULL }
 };
 
@@ -182,7 +194,7 @@ const char *program_authors[] =
     "Marcus Brinkmann",
     NULL
   };
-    
+
 struct ifconfig *
 parse_opt_new_ifs (char *name)
 {
@@ -203,10 +215,10 @@ parse_opt_set_##field (struct ifconfig *ifp, char *addr)	\
 {								\
   if (!ifp)							\
     error (EXIT_FAILURE, 0,                                     \
-           "no interface specified for %s `%s'", #fname, addr); \
+	   "no interface specified for %s `%s'", #fname, addr); \
   if (ifp->valid & IF_VALID_##fvalid)				\
     error (EXIT_FAILURE, 0,                                     \
-           "only one %s allowed for interface `%s'",		\
+	   "only one %s allowed for interface `%s'",		\
 	   #fname, ifp->name);				        \
   ifp->field = addr;						\
   ifp->valid |= IF_VALID_##fvalid;				\
@@ -216,6 +228,7 @@ PARSE_OPT_SET_ADDR (address, address, ADDR)
 PARSE_OPT_SET_ADDR (netmask, netmask, NETMASK)
 PARSE_OPT_SET_ADDR (dstaddr, destination / peer address, DSTADDR)
 PARSE_OPT_SET_ADDR (brdaddr, broadcast address, BRDADDR)
+
 #define PARSE_OPT_SET_INT(field, fname, fvalid) \
 void								\
 parse_opt_set_##field (struct ifconfig *ifp, char *arg)		\
@@ -223,17 +236,17 @@ parse_opt_set_##field (struct ifconfig *ifp, char *arg)		\
   char *end;							\
   if (!ifp)							\
     error (EXIT_FAILURE, 0,                                     \
-           "no interface specified for %s `%s'\n",              \
-           #fname, arg);                                        \
+	   "no interface specified for %s `%s'\n",              \
+	   #fname, arg);                                        \
   if (ifp->valid & IF_VALID_##fvalid)				\
     error (EXIT_FAILURE, 0,                                     \
-           "only one %s allowed for interface `%s'",		\
-           #fname, ifp->name);	 			        \
+	   "only one %s allowed for interface `%s'",		\
+	   #fname, ifp->name);				        \
   ifp->field =  strtol (arg, &end, 0);				\
   if (*arg == '\0' || *end != '\0')				\
     error (EXIT_FAILURE, 0,                                     \
-           "mtu value `%s' for interface `%s' is not a number",	\
-           arg, ifp->name);			                \
+	   "mtu value `%s' for interface `%s' is not a number",	\
+	   arg, ifp->name);			                \
   ifp->valid |= IF_VALID_##fvalid;				\
 }
 PARSE_OPT_SET_INT (mtu, mtu value, MTU)
@@ -242,18 +255,58 @@ void parse_opt_set_af (struct ifconfig *ifp, char *af)
 {
   if (!ifp)
     error (EXIT_FAILURE, 0,
-           "no interface specified for address family `%s'", af);
+	   "no interface specified for address family `%s'", af);
 
   if (!strcasecmp (af, "inet"))
     ifp->af = AF_INET;
   else
     error (EXIT_FAILURE, 0,
-           "unknown address family `%s' for interface `%s': is not a number", 
-           af, ifp->name);
+	   "unknown address family `%s' for interface `%s': is not a number",
+	   af, ifp->name);
   ifp->valid |= IF_VALID_AF;
 }
 
 void
+parse_opt_set_flag (struct ifconfig *ifp, int flag, int rev)
+{
+  if (rev)
+    ifp->clrflags |= flag;
+  else
+    ifp->setflags |= flag;
+}
+
+void
+parse_opt_flag_list (struct ifconfig *ifp, const char *name)
+{
+  while (*name)
+    {
+      int mask, rev;
+      char *p = strchr (name, ',');
+      size_t len;
+
+      if (p)
+	len = p - name;
+      else
+	len = strlen (name);
+
+      if ((mask = if_nametoflag (name, len, &rev)) == 0)
+	error (EXIT_FAILURE, 0, "unknown flag %*.*s", len, len, name);
+      parse_opt_set_flag (ifp, mask, rev);
+
+      name += len;
+      if (p)
+	name++;
+    }
+}
+
+void
+parse_opt_set_point_to_point (struct ifconfig *ifp, char *addr)
+{
+  parse_opt_set_dstaddr (ifp, addr);
+  parse_opt_set_flag (ifp, IFF_POINTOPOINT, 0);
+}
+
+void
 parse_opt_set_default_format (const char *new_format)
 {
   struct format *frm = formats;
@@ -293,20 +346,24 @@ static error_t
 parse_opt (int key, char *arg, struct argp_state *state)
 {
   struct ifconfig *ifp = *(struct ifconfig **)state->input;
-  
+
   switch (key)
     {
     case ARGP_KEY_INIT:
       state->child_inputs[0] = state->input;
       break;
-      
+
     case 'i':		/* Interface name.  */
       parse_opt_finalize (ifp);
       ifp = parse_opt_new_ifs (arg);
       *(struct ifconfig **) state->input = ifp;
       break;
 
-    case 'a':		/* Interface address.  */
+    case 'a':
+      all_option = 1;
+      break;
+
+    case 'A':		/* Interface address.  */
       parse_opt_set_address (ifp, arg);
       break;
 
@@ -316,7 +373,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
     case 'd':		/* Interface dstaddr.  */
     case 'p':
-      parse_opt_set_dstaddr (ifp, arg);
+      parse_opt_set_point_to_point (ifp, arg);
       break;
 
     case 'b':		/* Interface broadcast address.  */
@@ -324,10 +381,18 @@ parse_opt (int key, char *arg, struct argp_state *state)
       parse_opt_set_brdaddr (ifp, arg);
       break;
 
+    case 'F':
+      parse_opt_flag_list (ifp, arg);
+      break;
+
     case 'M':		/* Interface MTU.  */
       parse_opt_set_mtu (ifp, arg);
       break;
 
+    case 'v':
+      verbose++;
+      break;
+
     case METRIC_OPTION:		/* Interface metric.  */
       parse_opt_set_metric (ifp, arg);
       break;
@@ -336,6 +401,14 @@ parse_opt (int key, char *arg, struct argp_state *state)
       parse_opt_set_default_format (arg);
       break;
 
+    case UP_OPTION:
+      parse_opt_set_flag (ifp, IFF_UP | IFF_RUNNING, 0);
+      break;
+
+    case DOWN_OPTION:
+      parse_opt_set_flag (ifp, IFF_UP, 1);
+      break;
+
     default:
       return ARGP_ERR_UNKNOWN;
     }
@@ -343,6 +416,23 @@ parse_opt (int key, char *arg, struct argp_state *state)
   return 0;
 }
 
+static char *
+default_help_filter (int key, const char *text, void *input)
+{
+  char *s;
+
+  switch (key)
+    {
+    default:
+      s = (char*) text;
+      break;
+
+    case ARGP_KEY_HELP_EXTRA:
+      s = if_format_flags ("Known flags are: ");
+    }
+  return s;
+}
+
 static struct argp_child argp_children[2];
 static struct argp argp =
   {
@@ -350,6 +440,8 @@ static struct argp argp =
     parse_opt,
     NULL,
     doc,
+    NULL,
+    default_help_filter
   };
 
 
@@ -388,7 +480,7 @@ parse_cmdline (int argc, char *argv[])
 	  ifs = realloc (ifs, ++nifs * sizeof (struct ifconfig));
 	  if (!ifs)
 	    error (EXIT_FAILURE, errno,
-	           "can't get memory for interface configuration");
+		   "can't get memory for interface configuration");
 	  ifp = &ifs[nifs - 1];
 	  *ifp = ifconfig_initializer;
 	  ifp->name = ifnxp->if_name;
@@ -397,7 +489,7 @@ parse_cmdline (int argc, char *argv[])
 	  ifnxp++;
 	}
       /* XXX: We never do if_freenameindex (ifnx), because we are
-         keeping the names for later instead using strdup
-         (if->if_name) here.  */
+	 keeping the names for later instead using strdup
+	 (if->if_name) here.  */
     }
 }
diff --git a/ifconfig/options.h b/ifconfig/options.h
index e578666..43b5d33 100644
--- a/ifconfig/options.h
+++ b/ifconfig/options.h
@@ -32,9 +32,9 @@ struct ifconfig
 {
   char *name;
   int valid;
-# define IF_VALID_SYSTEM		0x001
+# define IF_VALID_SYSTEM	0x001
   struct system_ifconfig *system;
-# define IF_VALID_FORMAT		0x002
+# define IF_VALID_FORMAT	0x002
   const char *format;
 # define IF_VALID_AF		0x004
   sa_family_t af;
@@ -48,8 +48,10 @@ struct ifconfig
   char *brdaddr;
 # define IF_VALID_MTU		0x080
   int mtu;
-# define IF_VALID_METRIC		0x100
+# define IF_VALID_METRIC	0x100
   int metric;
+  int setflags;
+  int clrflags;
 };
 
 struct format
@@ -75,6 +77,10 @@ void parse_opt_set_netmask (struct ifconfig *ifp, char *addr);
 void parse_opt_set_mtu (struct ifconfig *ifp, char *addr);
 void parse_opt_set_metric (struct ifconfig *ifp, char *addr);
 void parse_opt_set_default_format (const char *format);
+void parse_opt_set_flag (struct ifconfig *ifp, int flag, int rev);
+void parse_opt_flag_list (struct ifconfig *ifp, const char *name);
+void parse_opt_set_point_to_point (struct ifconfig *ifp, char *addr);
+
 void parse_opt_finalize (struct ifconfig *ifp);
 
 void parse_cmdline (int argc, char *argv[]);
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index 784185a..4db2792 100644
--- a/ifconfig/printif.c
+++ b/ifconfig/printif.c
@@ -215,7 +215,7 @@ put_ulong (format_data_t form, int argc, char *argv[], unsigned long value)
 
 	  if (*p == 'l')
 	    p++;
-	  
+
 	  switch (*p)
 	    {
 	    default:
@@ -519,7 +519,7 @@ fh_index (format_data_t form, int argc, char *argv[])
 
   if (indx == 0)
     error (EXIT_FAILURE, errno,
-           "No index number found for interface `%s'",
+	   "No index number found for interface `%s'",
 	   form->name);
   *column += printf ("%i", indx);
   had_output = 1;
@@ -542,7 +542,7 @@ fh_addr (format_data_t form, int argc, char *argv[])
 #ifdef SIOCGIFADDR
   if (ioctl (form->sfd, SIOCGIFADDR, form->ifr) < 0)
     error (EXIT_FAILURE, errno,
-           "SIOCGIFADDR failed for interface `%s'",
+	   "SIOCGIFADDR failed for interface `%s'",
 	   form->ifr->ifr_name);
   else
     put_addr (form, argc, argv, &form->ifr->ifr_addr);
@@ -569,7 +569,7 @@ fh_netmask (format_data_t form, int argc, char *argv[])
 #ifdef SIOCGIFNETMASK
   if (ioctl (form->sfd, SIOCGIFNETMASK, form->ifr) < 0)
     error (EXIT_FAILURE, errno,
-           "SIOCGIFNETMASK failed for interface `%s'",
+	   "SIOCGIFNETMASK failed for interface `%s'",
 	   form->ifr->ifr_name);
   else
     put_addr (form, argc, argv, &form->ifr->ifr_netmask);
@@ -585,8 +585,9 @@ fh_brdaddr_query (format_data_t form, int argc, char *argv[])
 #ifdef SIOCGIFBRDADDR
 # ifdef SIOCGIFFLAGS
   int f;
+  int rev;
 
-  if (0 == (f = if_nametoflag ("BROADCAST"))
+  if (0 == (f = if_nameztoflag ("BROADCAST", &rev))
       || (ioctl (form->sfd, SIOCGIFFLAGS, form->ifr) < 0)
       || ((f & form->ifr->ifr_flags) == 0))
     {
@@ -607,8 +608,8 @@ fh_brdaddr (format_data_t form, int argc, char *argv[])
 #ifdef SIOCGIFBRDADDR
   if (ioctl (form->sfd, SIOCGIFBRDADDR, form->ifr) < 0)
     error (EXIT_FAILURE, errno,
-           "SIOCGIFBRDADDR failed for interface `%s'",
-           form->ifr->ifr_name);
+	   "SIOCGIFBRDADDR failed for interface `%s'",
+	   form->ifr->ifr_name);
   else
     put_addr (form, argc, argv, &form->ifr->ifr_broadaddr);
 #else
@@ -623,8 +624,9 @@ fh_dstaddr_query (format_data_t form, int argc, char *argv[])
 #ifdef SIOCGIFDSTADDR
 # ifdef SIOCGIFFLAGS
   int f;
+  int rev;
 
-  if (0 == (f = if_nametoflag ("POINTOPOINT"))
+  if (0 == (f = if_nameztoflag ("POINTOPOINT", &rev))
       || (ioctl (form->sfd, SIOCGIFFLAGS, form->ifr) < 0)
       || ((f & form->ifr->ifr_flags) == 0))
     {
@@ -645,7 +647,7 @@ fh_dstaddr (format_data_t form, int argc, char *argv[])
 #ifdef SIOCGIFDSTADDR
   if (ioctl (form->sfd, SIOCGIFDSTADDR, form->ifr) < 0)
     error (EXIT_FAILURE, errno,
-           "SIOCGIFDSTADDR failed for interface `%s'",
+	   "SIOCGIFDSTADDR failed for interface `%s'",
 	   form->ifr->ifr_name);
   else
     put_addr (form, argc, argv, &form->ifr->ifr_dstaddr);
@@ -672,7 +674,7 @@ fh_mtu (format_data_t form, int argc, char *argv[])
 #ifdef SIOCGIFMTU
   if (ioctl (form->sfd, SIOCGIFMTU, form->ifr) < 0)
     error (EXIT_FAILURE, errno,
-           "SIOCGIFMTU failed for interface `%s'",
+	   "SIOCGIFMTU failed for interface `%s'",
 	   form->ifr->ifr_name);
   else
     put_int (form, argc, argv, form->ifr->ifr_mtu);
@@ -699,7 +701,7 @@ fh_metric (format_data_t form, int argc, char *argv[])
 #ifdef SIOCGIFMETRIC
   if (ioctl (form->sfd, SIOCGIFMETRIC, form->ifr) < 0)
     error (EXIT_FAILURE, errno,
-           "SIOCGIFMETRIC failed for interface `%s'",
+	   "SIOCGIFMETRIC failed for interface `%s'",
 	   form->ifr->ifr_name);
   else
     put_int (form, argc, argv, form->ifr->ifr_metric);
@@ -726,7 +728,7 @@ fh_flags (format_data_t form, int argc, char *argv[])
 #ifdef SIOCGIFFLAGS
   if (ioctl (form->sfd, SIOCGIFFLAGS, form->ifr) < 0)
     error (EXIT_FAILURE, errno,
-           "SIOCGIFFLAGS failed for interface `%s'",
+	   "SIOCGIFFLAGS failed for interface `%s'",
 	   form->ifr->ifr_name);
   else
     {
@@ -786,7 +788,7 @@ fh_baseaddr_query (format_data_t form, int argc, char *argv[])
 void
 fh_baseaddr (format_data_t form, int argc, char *argv[])
 {
-  if (form->ifr->ifr_map.base_addr >= 0x100)  
+  if (form->ifr->ifr_map.base_addr >= 0x100)
     put_int (form, argc, argv, form->ifr->ifr_map.base_addr);
   else
     put_string (form, "(not available)");
@@ -804,7 +806,7 @@ fh_memstart_query (format_data_t form, int argc, char *argv[])
 void
 fh_memstart (format_data_t form, int argc, char *argv[])
 {
-  if (form->ifr->ifr_map.mem_start)  
+  if (form->ifr->ifr_map.mem_start)
     put_ulong (form, argc, argv, form->ifr->ifr_map.mem_start);
   else
     put_string (form, "(not available)");
@@ -822,7 +824,7 @@ fh_memend_query (format_data_t form, int argc, char *argv[])
 void
 fh_memend (format_data_t form, int argc, char *argv[])
 {
-  if (form->ifr->ifr_map.mem_end)  
+  if (form->ifr->ifr_map.mem_end)
     put_ulong (form, argc, argv, form->ifr->ifr_map.mem_end);
   else
     put_string (form, "(not available)");
@@ -840,7 +842,7 @@ fh_dma_query (format_data_t form, int argc, char *argv[])
 void
 fh_dma (format_data_t form, int argc, char *argv[])
 {
-  if (form->ifr->ifr_map.dma)  
+  if (form->ifr->ifr_map.dma)
     put_int (form, argc, argv, form->ifr->ifr_map.dma);
   else
     put_string (form, "(not available)");
@@ -868,8 +870,8 @@ print_interfaceX (format_data_t form, int quiet)
 	break;
 
       /* Look at next character.  If it is a '$' or '}', print that
-         and skip the '$'.  If it is something else than '{', print
-         both.  Otherwise enter substitution mode.  */
+	 and skip the '$'.  If it is something else than '{', print
+	 both.  Otherwise enter substitution mode.  */
       switch (*(++p))
 	{
 	default:
diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
index 4af9186..8a72903 100644
--- a/ifconfig/system/linux.c
+++ b/ifconfig/system/linux.c
@@ -289,7 +289,7 @@ struct pnd_stats
   unsigned long rx_dropped;        /* input packets dropped */
   unsigned long tx_dropped;        /* transmit packets dropped */
   unsigned long rx_multicast;      /* multicast packets received */
-  unsigned long rx_compressed;     /* compressed packets received */ 
+  unsigned long rx_compressed;     /* compressed packets received */
   unsigned long tx_compressed;     /* compressed packets transmitted */
   unsigned long collisions;
 
@@ -428,7 +428,7 @@ pnd_read ()
       struct pnd_stats *stats = xzalloc (sizeof (*stats));;
       char *p = buf, *q;
       size_t len;
-      
+
       while (*p
 	     && isascii (*(unsigned char*) p) && isspace (*(unsigned char*) p))
 	p++;
@@ -487,7 +487,7 @@ system_fh_ifstat_query (format_data_t form, int argc, char *argv[])
 {
   select_arg (form, argc, argv,
 	      pnd_stats_locate (form->ifr->ifr_name) ? 0 : 1);
-}  
+}
 
 #define _IU_DECLARE(fld)						     \
 void                                                                         \
@@ -496,7 +496,7 @@ _IU_CAT2 (system_fh_,fld) (format_data_t form, int argc, char *argv[])       \
   struct pnd_stats *stats = pnd_stats_locate (form->ifr->ifr_name);          \
   if (!stats)                                                                \
     put_string (form, "(" #fld " unknown)");                                 \
-  else 								             \
+  else								             \
     put_ulong (form, argc, argv, stats->fld);                                \
 }
 
@@ -546,7 +546,7 @@ system_fh_hwaddr (format_data_t form, int argc, char *argv[])
 #ifdef SIOCGIFHWADDR
   if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0)
     error (EXIT_FAILURE, errno,
-           "SIOCGIFHWADDR failed for interface `%s'",
+	   "SIOCGIFHWADDR failed for interface `%s'",
 	   form->ifr->ifr_name);
   else
     {
@@ -555,7 +555,7 @@ system_fh_hwaddr (format_data_t form, int argc, char *argv[])
       arp = arphrd_findvalue (form->ifr->ifr_hwaddr.sa_family);
       if (arp && arp->print_hwaddr)
 	arp->print_hwaddr (form,
-                           (unsigned char *) form->ifr->ifr_hwaddr.sa_data);
+			   (unsigned char *) form->ifr->ifr_hwaddr.sa_data);
       else
 	put_string (form, "(hwaddr unknown)");
     }
@@ -582,7 +582,7 @@ system_fh_hwtype (format_data_t form, int argc, char *argv[])
 #ifdef SIOCGIFHWADDR
   if (ioctl (form->sfd, SIOCGIFHWADDR, form->ifr) < 0)
     error (EXIT_FAILURE, errno,
-           "SIOCGIFHWADDR failed for interface `%s'",
+	   "SIOCGIFHWADDR failed for interface `%s'",
 	   form->ifr->ifr_name);
   else
     {
@@ -617,7 +617,7 @@ system_fh_txqlen (format_data_t form, int argc, char *argv[])
 #ifdef SIOCGIFTXQLEN
   if (ioctl (form->sfd, SIOCGIFTXQLEN, form->ifr) < 0)
     error (EXIT_FAILURE, errno,
-           "SIOCGIFTXQLEN failed for interface `%s'",
+	   "SIOCGIFTXQLEN failed for interface `%s'",
 	   form->ifr->ifr_name);
   else
     put_int (form, argc, argv, form->ifr->ifr_qlen);
@@ -633,7 +633,7 @@ system_fh_txqlen (format_data_t form, int argc, char *argv[])
 const char *system_help = "\
  NAME [ADDR] [broadcast BRDADDR]\
  [pointopoint|dstaddr DSTADDR] [netmask MASK]\
- [metric N] [mtu N] [txqueuelen N]";
+ [metric N] [mtu N] [txqueuelen N] [up|down] [FLAGS]";
 
 void
 system_parse_opt_set_txqlen (struct ifconfig *ifp, char *arg)
@@ -642,7 +642,7 @@ system_parse_opt_set_txqlen (struct ifconfig *ifp, char *arg)
 
   if (!ifp)
     error (EXIT_FAILURE, 0,
-           "no interface specified for txqlen `%s'", arg);
+	   "no interface specified for txqlen `%s'", arg);
 
   if (!(ifp->valid & IF_VALID_SYSTEM))
     {
@@ -655,13 +655,13 @@ system_parse_opt_set_txqlen (struct ifconfig *ifp, char *arg)
     }
   if (ifp->system->valid & IF_VALID_TXQLEN)
     error (EXIT_FAILURE, 0,
-           "only one txqlen allowed for interface `%s'",
+	   "only one txqlen allowed for interface `%s'",
 	   ifp->name);
   ifp->system->txqlen = strtol (arg, &end, 0);
   if (*arg == '\0' || *end != '\0')
     error (EXIT_FAILURE, 0,
-           "txqlen value `%s' for interface `%s' is not a number", 
-           arg, ifp->name);
+	   "txqlen value `%s' for interface `%s' is not a number",
+	   arg, ifp->name);
   ifp->system->valid |= IF_VALID_TXQLEN;
 }
 
@@ -727,8 +727,9 @@ system_parse_opt_rest (struct ifconfig **ifp, int argc, char *argv[])
     EXPECT_NETMASK,
     EXPECT_MTU,
     EXPECT_METRIC,
-    EXPECT_TXQLEN
+    EXPECT_TXQLEN,
   } expect = EXPECT_INET;
+  int mask, rev;
 
   *ifp = parse_opt_new_ifs (argv[0]);
 
@@ -741,7 +742,7 @@ system_parse_opt_rest (struct ifconfig **ifp, int argc, char *argv[])
 	  break;
 
 	case EXPECT_DSTADDR:
-	  parse_opt_set_dstaddr (*ifp, argv[i]);
+	  parse_opt_set_point_to_point (*ifp, argv[i]);
 	  break;
 
 	case EXPECT_NETMASK:
@@ -765,7 +766,7 @@ system_parse_opt_rest (struct ifconfig **ifp, int argc, char *argv[])
 	  if (!strcmp (argv[i], "inet"))
 	    continue;
 	  break;
-	  
+
 	case EXPECT_NOTHING:
 	  break;
 	}
@@ -785,6 +786,12 @@ system_parse_opt_rest (struct ifconfig **ifp, int argc, char *argv[])
 	expect = EXPECT_MTU;
       else if (!strcmp (argv[i], "txqueuelen"))
 	expect = EXPECT_TXQLEN;
+      else if (!strcmp (argv[i], "up"))
+	parse_opt_set_flag (*ifp, IFF_UP | IFF_RUNNING, 0);
+      else if (!strcmp (argv[i], "down"))
+	parse_opt_set_flag (*ifp, IFF_UP, 1);
+      else if ((mask = if_nameztoflag (argv[i], &rev)) != 0)
+	parse_opt_set_flag (*ifp, mask, rev);
       else
 	parse_opt_set_address (*ifp, argv[i]);
     }

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

Summary of changes:
 ChangeLog               |   91 +++++++++++++++++++++----------
 ifconfig/changeif.c     |   27 +++++++++
 ifconfig/flags.c        |  133 ++++++++++++++++++++++++++++++++++++++++-----
 ifconfig/flags.h        |    5 ++-
 ifconfig/options.c      |  138 +++++++++++++++++++++++++++++++++++++++--------
 ifconfig/options.h      |   12 +++-
 ifconfig/printif.c      |   38 +++++++------
 ifconfig/system/linux.c |   39 ++++++++------
 8 files changed, 378 insertions(+), 105 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Wed Jan 27 16:08:18 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NaF7a-0004C8-So
	for mharc-commit-inetutils@gnu.org; Wed, 27 Jan 2010 16:08:18 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NaF7Z-0004Aw-8V
	for commit-inetutils@gnu.org; Wed, 27 Jan 2010 16:08:17 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NaF7U-00046R-H9
	for commit-inetutils@gnu.org; Wed, 27 Jan 2010 16:08:16 -0500
Received: from [199.232.76.173] (port=48108 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NaF7U-00046G-Eq
	for commit-inetutils@gnu.org; Wed, 27 Jan 2010 16:08:12 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:48680
	helo=internal.in.savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <ams@gnu.org>) id 1NaF7U-0003Dl-2M
	for commit-inetutils@gnu.org; Wed, 27 Jan 2010 16:08:12 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal with esmtp (Exim 4.69) (envelope-from <ams@gnu.org>)
	id 1NaF7T-0006VH-I9
	for commit-inetutils@gnu.org; Wed, 27 Jan 2010 21:08:11 +0000
Received: from ams by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <ams@savannah.gnu.org>) id 1NaF7T-0007jr-8f
	for commit-inetutils@gnu.org; Wed, 27 Jan 2010 21:08:11 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: bd081e76a1cc46522a32a1fe68d4a369cebeca84
X-Git-Newrev: fd031fa16e1c0366b4baab61416b2790572396e5
Message-Id: <E1NaF7T-0007jr-8f@vcs-noshell.in.savannah.gnu.org>
From: "Alfred M. Szmidt" <ams@gnu.org>
Date: Wed, 27 Jan 2010 21:08:11 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_7-28-gfd031fa
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2010 21:08:17 -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  fd031fa16e1c0366b4baab61416b2790572396e5 (commit)
       via  1644726f371c4902a47819c7d08a62536d5e4eac (commit)
      from  bd081e76a1cc46522a32a1fe68d4a369cebeca84 (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=fd031fa16e1c0366b4baab61416b2790572396e5


commit fd031fa16e1c0366b4baab61416b2790572396e5
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Wed Jan 27 22:14:22 2010 +0100

    Fixed entries.

diff --git a/ChangeLog b/ChangeLog
index 07a222e..c9d9476 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,31 +3,39 @@
 	Implement setting interface options: up, down, multicast,
 	allmulti.
 
-	* ifconfig/changeif.c (set_flags): New function.
-	(configure_if): Set flags.
-	* ifconfig/flags.c (struct if_flag): New member `rev'.
+	* ifconfig/flags.c: Include <stdlib.h> and "xalloc.h".
+	(if_flag) <rev>: New member.
+	(IFF_NOARGP) [IFF_NOARP]: New flag for "ARP".
+	(IFF_NOTRAILERS) [IFF_NOTRAILERS]: New flag for "TRAILERS".
+	(IFF_NOACC) [IFF_NOACC]: New flag for"ACC".
+	(IFF_NOSR8025) [IFF_NOSR8025]: New flag for "SR8025"
+	(IFF_NOCHECKSUM) [IFF_NOCHECKSUM]: New flag for "CHECKSUM".
+	(cmpname, if_nameztoflag, if_format_flags): New function.
 	(if_flagtoname) Avoid extra comparison.
-	(if_nametoflag): Rewrite. Take 2 additional arguments.
-	(if_nameztoflag): New function.
-	(if_format_flags): New function.
-	* ifconfig/flags.h (if_nametoflag): Change signature.
-	(if_nameztoflag): New prototype.
-	* ifconfig/options.c (all_option): New global.
-	(argp_options): Use -A as short option for --address.
-	Add new option -a (--all).
-	New options: --up, --down, --flags.
-	(parse_opt_set_flag, parse_opt_flag_list): New functions.
-	(parse_opt_set_point_to_point): New function.
-	(parse_opt): Handle new options.
-	(argp): Add help filter.
-	* ifconfig/options.h (struct ifconfig): New members: setflags
-	and clrflags.
+        (if_nametoflag): Rewrite.
+	* ifconfig/flags.h (if_nametoflag): Updated prototype.
+	(if_nameztoflag, if_format_flags): New prototypes.
+	* ifconfig/options.c (all_option): New global variable.
+	(UP_OPTION, DOWN_OPTION): New enumerators.
+	(argp_options) <address>: Use -A as short option.  <up, down,
+	flags>: New options.  <all>: New option, with -a as short option.
+	<peer>: Handle an extra argument.  <mtu>: Fix typo.
+	(parse_opt_set_flag, parse_opt_flag_list)
+	(parse_opt_set_point_to_point): New functions.
+	(parse_opt) <UP_OPTION, DOWN_OPTION, F, a>: Handle new options.
+	<p, d>: Call parse_opt_set_point_to_point instead.  <v>: Handle
+	--verbose flag.
+	(default_help_filter): New function
+	(argp): Use default_help_filter as help filter.
+	* ifconfig/options.h (ifconfig) <setflags, clrflags>: New members.
 	(parse_opt_set_flag, parse_opt_flag_list)
 	(parse_opt_set_point_to_point): New prototypes.
 	* ifconfig/printif.c (fh_brdaddr_query, fh_dstaddr_query): Update
 	calls to if_nametoflag.
-	* ifconfig/system/linux.c (system_help): Update.
-	(system_parse_opt_rest): Allow for flags (up, down, arp, etc.)
+	* ifconfig/system/linux.c (system_help): Update docstring.
+	(system_parse_opt_rest) <EXPECT_DSTADDR>: Call
+	parse_opt_set_point_to_point instead.  <up, down, flags>: Handle
+	new options.
 
 2010-01-12  Simon Josefsson  <simon@josefsson.org>
 

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


commit 1644726f371c4902a47819c7d08a62536d5e4eac
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Wed Jan 27 22:14:15 2010 +0100

    Updated.  (silent change)

diff --git a/NEWS b/NEWS
index 93b5b13..7c7598a 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,16 @@ Please send inetutils bug reports to <bug-inetutils@gnu.org>.
 Unreleased
 Version 1.7.90:
 
+* inetutils
+
+New commands (up and down) to bring up/down an interface using
+ifconfig.
+
+The short option for --address, -a, has been renamed to -A.  And --all
+now uses -a instead.
+
+New commands (multicast, allmulti) to set multicast flags.
+
 * Man pages for the daemons are now in section 8 instead of 1.
 
 * There is now a man page for ping6 too.

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

Summary of changes:
 ChangeLog |   48 ++++++++++++++++++++++++++++--------------------
 NEWS      |   10 ++++++++++
 2 files changed, 38 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Thu Jan 28 03:07:25 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NaPPR-00037t-2S
	for mharc-commit-inetutils@gnu.org; Thu, 28 Jan 2010 03:07:25 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NaPPO-00037n-Rd
	for commit-inetutils@gnu.org; Thu, 28 Jan 2010 03:07:22 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NaPPJ-00037N-EW
	for commit-inetutils@gnu.org; Thu, 28 Jan 2010 03:07:21 -0500
Received: from [199.232.76.173] (port=43587 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NaPPJ-00037K-6e
	for commit-inetutils@gnu.org; Thu, 28 Jan 2010 03:07:17 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:59122
	helo=internal.in.savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gray@gnu.org.ua>) id 1NaPPI-0007oK-EI
	for commit-inetutils@gnu.org; Thu, 28 Jan 2010 03:07:16 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal with esmtp (Exim 4.69) (envelope-from <gray@gnu.org.ua>)
	id 1NaPPI-00076e-1U
	for commit-inetutils@gnu.org; Thu, 28 Jan 2010 08:07:16 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <gray@savannah.gnu.org>) id 1NaPPH-0005oe-I1
	for commit-inetutils@gnu.org; Thu, 28 Jan 2010 08:07:15 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: fd031fa16e1c0366b4baab61416b2790572396e5
X-Git-Newrev: 49620c40386712a2b4dd6625ff0400be4855c1ee
Message-Id: <E1NaPPH-0005oe-I1@vcs-noshell.in.savannah.gnu.org>
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Thu, 28 Jan 2010 08:07:15 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_7-29-g49620c4
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jan 2010 08:07:23 -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  49620c40386712a2b4dd6625ff0400be4855c1ee (commit)
      from  fd031fa16e1c0366b4baab61416b2790572396e5 (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=49620c40386712a2b4dd6625ff0400be4855c1ee


commit 49620c40386712a2b4dd6625ff0400be4855c1ee
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Thu Jan 28 10:03:53 2010 +0200

    Implement -a option; correctly print interface metric.
    
    * ifconfig/options.c (formats) <gnu-one-entry>
    <net-tools,unix,osf>: Use ${ifdisplay?}
    to select interfaces to be displayed.
    (ifs_cmdline): New global.
    (parse_opt_new_ifs): Set ifs_cmdline.
    * ifconfig/options.h (all_option, ifs_cmdline): New externs.
    * ifconfig/printif.c (format_handles) <ifdisplay?>: New handler.
    (fh_ifdisplay_query): New function.
    (fh_metric_query): Metric of 0 is OK.
    (fh_metric): Display 1 for zero metric, as other ifconfigs do.
    * ifconfig/printif.h (fh_ifdisplay_query): New prototype.

diff --git a/ChangeLog b/ChangeLog
index c9d9476..2a3ef02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-28  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	Implement -a option; correctly print interface metric.
+
+	* ifconfig/options.c (formats) <gnu-one-entry>
+	<net-tools,unix,osf>: Use ${ifdisplay?} to select interfaces to
+	be displayed.
+	(ifs_cmdline): New global.
+	(parse_opt_new_ifs): Set ifs_cmdline.
+	* ifconfig/options.h (all_option, ifs_cmdline): New externs.
+	* ifconfig/printif.c (format_handles) <ifdisplay?>: New handler.
+	(fh_ifdisplay_query): New function.
+	(fh_metric_query): Metric of 0 is OK.
+	(fh_metric): Display 1 for zero metric, as other ifconfigs do.
+	* ifconfig/printif.h (fh_ifdisplay_query): New prototype.
+
 2010-01-27  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	Implement setting interface options: up, down, multicast,
@@ -12,7 +28,7 @@
 	(IFF_NOCHECKSUM) [IFF_NOCHECKSUM]: New flag for "CHECKSUM".
 	(cmpname, if_nameztoflag, if_format_flags): New function.
 	(if_flagtoname) Avoid extra comparison.
-        (if_nametoflag): Rewrite.
+	(if_nametoflag): Rewrite.
 	* ifconfig/flags.h (if_nametoflag): Updated prototype.
 	(if_nameztoflag, if_format_flags): New prototypes.
 	* ifconfig/options.c (all_option): New global variable.
diff --git a/ifconfig/options.c b/ifconfig/options.c
index 6064fe7..106e79a 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -67,6 +67,7 @@ struct format formats[] = {
   {"gnu", "${first?}{}{${\\n}}${format}{gnu-one-entry}"},
   {"gnu-one-entry",
    "${format}{check-existence}"
+   "${ifdisplay?}{"
    "${name} (${index}):${\\n}"
    "${addr?}{  inet address ${tab}{16}${addr}${\\n}}"
    "${netmask?}{  netmask ${tab}{16}${netmask}${\\n}}"
@@ -77,10 +78,13 @@ struct format formats[] = {
    "${metric?}{  metric ${tab}{16}${metric}${\\n}}"
    "${exists?}{hwtype?}{${hwtype?}{  link encap ${tab}{16}${hwtype}${\\n}}}"
    "${exists?}{hwaddr?}{${hwaddr?}{  hardware addr ${tab}{16}${hwaddr}${\\n}}}"
-   "${exists?}{txqlen?}{${txqlen?}{  tx queue len ${tab}{16}${txqlen}${\\n}}}"},
+   "${exists?}{txqlen?}{${txqlen?}{  tx queue len ${tab}{16}${txqlen}${\\n}}}"
+   "}"
+  },
   /* Resembles the output of ifconfig 1.39 (1999-03-19) in net-tools 1.52.  */
   {"net-tools",
    "${format}{check-existence}"
+   "${ifdisplay?}{"
    "${name}${exists?}{hwtype?}{${hwtype?}{${tab}{10}Link encap:${hwtype}}"
    "${hwaddr?}{  HWaddr ${hwaddr}}}${\\n}"
    "${addr?}{${tab}{10}inet addr:${addr}"
@@ -115,11 +119,13 @@ struct format formats[] = {
    "${newline}"
    "}}}"
    "${newline}"
+   "}"
   },
   /* Resembles the output of ifconfig shipped with unix systems like
      Solaris 2.7 or HPUX 10.20.  */
   {"unix",
    "${format}{check-existence}"
+   "${ifdisplay?}{"
    "${name}: flags=${flags}{number}<${flags}{string}{,}>"
    "${mtu?}{ mtu ${mtu}}${\\n}"
    "${addr?}{${\\t}inet ${addr}"
@@ -127,15 +133,20 @@ struct format formats[] = {
    "${netmask}{2}{%02x}${netmask}{3}{%02x}"
    "${brdaddr?}{ broadcast ${brdaddr}}${\\n}}"
    "${exists?}{hwtype?}{${hwtype?}{${\\t}${hwtype}"
-   "}${exists?}{hwaddr?}{${hwaddr?}{ ${hwaddr}}}${\\n}}"},
+   "}${exists?}{hwaddr?}{${hwaddr?}{ ${hwaddr}}}${\\n}}"
+   "}"
+  },
   /* Resembles the output of ifconfig shipped with OSF 4.0g.  */
   {"osf",
    "${format}{check-existence}"
+   "${ifdisplay?}{"
    "${name}: flags=${flags}{number}{%x}<${flags}{string}{,}>${\\n}"
    "${addr?}{${\\t}inet ${addr}"
    " netmask ${netmask}{0}{%02x}${netmask}{1}{%02x}"
    "${netmask}{2}{%02x}${netmask}{3}{%02x}"
-   "${brdaddr?}{ broadcast ${brdaddr}}" "${mtu?}{ ipmtu ${mtu}}${\\n}}"},
+   "${brdaddr?}{ broadcast ${brdaddr}}" "${mtu?}{ ipmtu ${mtu}}${\\n}}"
+   "}"
+  },
   /* If interface does not exist, print error message and exit. */
   {"check-existence",
    "${index?}{}"
@@ -148,6 +159,8 @@ struct format formats[] = {
 const char *default_format;
 /* Display all interfaces, even if down */
 int all_option;
+/* True if interfaces were given in the command line */
+int ifs_cmdline;
 
 enum {
   METRIC_OPTION = 256,
@@ -200,9 +213,11 @@ parse_opt_new_ifs (char *name)
 {
   struct ifconfig *ifp;
 
+  ifs_cmdline = 1;
   ifs = realloc (ifs, ++nifs * sizeof (struct ifconfig));
   if (!ifs)
-    error (EXIT_FAILURE, errno, "can't get memory for interface configuration");
+    error (EXIT_FAILURE, errno,
+	   "can't get memory for interface configuration");
   ifp = &ifs[nifs - 1];
   *ifp = ifconfig_initializer;
   ifp->name = name;
diff --git a/ifconfig/options.h b/ifconfig/options.h
index 43b5d33..5e2a6ab 100644
--- a/ifconfig/options.h
+++ b/ifconfig/options.h
@@ -61,6 +61,8 @@ struct format
 };
 
 extern struct format formats[];
+extern int all_option;
+extern int ifs_cmdline;
 
 /* Array of interfaces mentioned on the command line.  */
 extern struct ifconfig *ifs;
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index 4db2792..67a4b28 100644
--- a/ifconfig/printif.c
+++ b/ifconfig/printif.c
@@ -69,6 +69,7 @@ struct format_handle format_handles[] = {
   {"\\n", fh_newline},
   {"\\t", fh_tabulator},
   {"first?", fh_first},
+  {"ifdisplay?", fh_ifdisplay_query},
   {"tab", fh_tab},
   {"join", fh_join},
   {"exists?", fh_exists_query},
@@ -382,6 +383,25 @@ fh_first (format_data_t form, int argc, char *argv[])
   select_arg (form, argc, argv, form->first ? 0 : 1);
 }
 
+void
+fh_ifdisplay_query (format_data_t form, int argc, char *argv[])
+{
+  int n;
+
+#ifdef SIOCGIFFLAGS
+  int f;
+  int rev;
+
+  n = !(all_option || ifs_cmdline
+	|| ((f = if_nameztoflag ("UP", &rev))
+	    && ioctl (form->sfd, SIOCGIFFLAGS, form->ifr) == 0
+	    && (f & form->ifr->ifr_flags)));
+#else
+  n = 0;
+#endif
+  select_arg (form, argc, argv, n);
+}
+
 /* A tab implementation, which fills with spaces up to requested column or next
    tabstop.  */
 void
@@ -689,7 +709,7 @@ fh_metric_query (format_data_t form, int argc, char *argv[])
 {
 #ifdef SIOCGIFMETRIC
   if (ioctl (form->sfd, SIOCGIFMETRIC, form->ifr) >= 0)
-    select_arg (form, argc, argv, (form->ifr->ifr_metric > 0) ? 0 : 1);
+    select_arg (form, argc, argv, 0);
   else
 #endif
     select_arg (form, argc, argv, 1);
@@ -704,7 +724,8 @@ fh_metric (format_data_t form, int argc, char *argv[])
 	   "SIOCGIFMETRIC failed for interface `%s'",
 	   form->ifr->ifr_name);
   else
-    put_int (form, argc, argv, form->ifr->ifr_metric);
+    put_int (form, argc, argv,
+	     form->ifr->ifr_metric ? form->ifr->ifr_metric : 1);
 #else
   *column += printf ("(not available)");
   had_output = 1;
diff --git a/ifconfig/printif.h b/ifconfig/printif.h
index 9038572..b4391ce 100644
--- a/ifconfig/printif.h
+++ b/ifconfig/printif.h
@@ -77,6 +77,7 @@ void fh_nothing (format_data_t form, int argc, char *argv[]);
 void fh_newline (format_data_t form, int argc, char *argv[]);
 void fh_tabulator (format_data_t form, int argc, char *argv[]);
 void fh_first (format_data_t form, int argc, char *argv[]);
+void fh_ifdisplay_query (format_data_t form, int argc, char *argv[]);
 void fh_tab (format_data_t form, int argc, char *argv[]);
 void fh_join (format_data_t form, int argc, char *argv[]);
 void fh_exists_query (format_data_t form, int argc, char *argv[]);

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

Summary of changes:
 ChangeLog          |   18 +++++++++++++++++-
 ifconfig/options.c |   23 +++++++++++++++++++----
 ifconfig/options.h |    2 ++
 ifconfig/printif.c |   25 +++++++++++++++++++++++--
 ifconfig/printif.h |    1 +
 5 files changed, 62 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Fri Jan 29 12:13:02 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NauOz-000242-PT
	for mharc-commit-inetutils@gnu.org; Fri, 29 Jan 2010 12:13:01 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NauOy-00023R-0d
	for commit-inetutils@gnu.org; Fri, 29 Jan 2010 12:13:00 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NauOt-00020w-34
	for commit-inetutils@gnu.org; Fri, 29 Jan 2010 12:12:59 -0500
Received: from [199.232.76.173] (port=58224 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NauOt-00020t-0N
	for commit-inetutils@gnu.org; Fri, 29 Jan 2010 12:12:55 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:43425
	helo=internal.in.savannah.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <ams@gnu.org>) id 1NauOs-0008Kl-F7
	for commit-inetutils@gnu.org; Fri, 29 Jan 2010 12:12:54 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal with esmtp (Exim 4.69) (envelope-from <ams@gnu.org>)
	id 1NauOq-0000Td-BG
	for commit-inetutils@gnu.org; Fri, 29 Jan 2010 17:12:52 +0000
Received: from ams by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <ams@savannah.gnu.org>) id 1NauOq-0000Qr-3R
	for commit-inetutils@gnu.org; Fri, 29 Jan 2010 17:12:52 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 49620c40386712a2b4dd6625ff0400be4855c1ee
X-Git-Newrev: 700065918b9a33d08ceffbfe296a2d6220a70209
Message-Id: <E1NauOq-0000Qr-3R@vcs-noshell.in.savannah.gnu.org>
From: "Alfred M. Szmidt" <ams@gnu.org>
Date: Fri, 29 Jan 2010 17:12:52 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_7-30-g7000659
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jan 2010 17:13: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  700065918b9a33d08ceffbfe296a2d6220a70209 (commit)
      from  49620c40386712a2b4dd6625ff0400be4855c1ee (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=700065918b9a33d08ceffbfe296a2d6220a70209


commit 700065918b9a33d08ceffbfe296a2d6220a70209
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Fri Jan 29 18:19:02 2010 +0100

    Clarify warning message when installing a SUID root program.

diff --git a/ChangeLog b/ChangeLog
index 2a3ef02..3883212 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-29  Alfred M. Szmidt  <ams@gnu.org>
+
+	* ping/Makefile.am (install-ping-hook): Clarify warning message
+	when installing a SUID root program.
+	* src/Makefile.am (install-traceroute-hook, install-rsh-hook)
+	(install-rlogin-hook, install-rcp-hook): Likewise.
+
 2010-01-28  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	Implement -a option; correctly print interface metric.
diff --git a/ping/Makefile.am b/ping/Makefile.am
index 80e3578..33584dd 100644
--- a/ping/Makefile.am
+++ b/ping/Makefile.am
@@ -33,13 +33,11 @@ ping6_SOURCES = ping6.c ping_common.c ping_common.h ping6.h
 SUIDMODE = -o root -m 4775
 
 install-ping-hook:
-	-@for program in $(bin_PROGRAMS); do \
-	$(INSTALL_PROGRAM) $$program $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo $$program|sed '$(transform)'` ; \
+	-@for x in $(bin_PROGRAMS); do \
+	$(INSTALL_PROGRAM) $$x $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo $$x|sed '$(transform)'` ; \
 	if test $$? -ne 0; then \
-		echo 'INSTALL-ERROR:'; \
-		echo 'INSTALL-ERROR: THIS PROGRAM('$$program') MUST BE INSTALLED SETUID ROOT'; \
-		echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) '$$program' $(SUIDMODE) $(DESTDIR)$(bindir)/'$$program; \
-		echo 'INSTALL-ERROR:'; \
+	  echo "WARNING: insufficient access; not installing $$x"; \
+	  echo "NOTE: To install $$x run 'make install' as root"; \
 	fi \
 	done
 
diff --git a/src/Makefile.am b/src/Makefile.am
index c77e63d..df53858 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -103,37 +103,29 @@ install-exec-hook: @traceroute_INSTALL_HOOK@ @rsh_INSTALL_HOOK@ @rlogin_INSTALL_
 install-traceroute-hook:
 	-@$(INSTALL_PROGRAM) traceroute $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo traceroute|sed '$(transform)'` ; \
 	if test $$? -ne 0; then \
-		echo 'INSTALL-ERROR:'; \
-		echo 'INSTALL-ERROR: THIS PROGRAM(traceroute) MUST BE INSTALLED SETUID ROOT'; \
-		echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) 'traceroute' $(SUIDMODE) $(DESTDIR)$(bindir)/'traceroute; \
-		echo 'INSTALL-ERROR:'; \
+	  echo "WARNING: insufficient access; not installing traceroute"; \
+	  echo "NOTE: To install traceroute run 'make install' as root"; \
 	fi
 
 install-rsh-hook:
 	-@$(INSTALL_PROGRAM) rsh $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo rsh|sed '$(transform)'` ; \
 	if test $$? -ne 0; then \
-		echo 'INSTALL-ERROR:'; \
-		echo 'INSTALL-ERROR: THIS PROGRAM(rsh) MUST BE INSTdALLED SETUID ROOT'; \
-		echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) rsh $(SUIDMODE) $(DESTDIR)$(bindir)/rsh'; \
-		echo 'INSTALL-ERROR:'; \
+	  echo "WARNING: insufficient access; not installing rsh"; \
+	  echo "NOTE: To install rsh run 'make install' as root"; \
 	fi
 
 install-rlogin-hook:
 	-@$(INSTALL_PROGRAM) rlogin $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo rlogin|sed '$(transform)'` ; \
 	if test $$? -ne 0; then \
-		echo 'INSTALL-ERROR:'; \
-		echo 'INSTALL-ERROR: THIS PROGRAM(rlogin) MUST BE INSTALLED SETUID ROOT'; \
-		echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) rlogin $(SUIDMODE) $(DESTDIR)$(bindir)/rlogin'; \
-		echo 'INSTALL-ERROR:'; \
+	  echo "WARNING: insufficient access; not installing rlogin"; \
+	  echo "NOTE: To install rlogin run 'make install' as root"; \
 	fi
 
 install-rcp-hook:
 	-@$(INSTALL_PROGRAM) rcp $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo rcp|sed '$(transform)'` ; \
 	if test $$? -ne 0; then \
-		echo 'INSTALL-ERROR:'; \
-		echo 'INSTALL-ERROR: THIS PROGRAM(rcp) MUST BE INSTALLED SETUID ROOT'; \
-		echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) rcp $(SUIDMODE) $(DESTDIR)$(bindir)/rcp'; \
-		echo 'INSTALL-ERROR:'; \
+	  echo "WARNING: insufficient access; not installing rcp"; \
+	  echo "NOTE: To install rcp run 'make install' as root"; \
 	fi
 
 @PATHDEFS_MAKE@

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

Summary of changes:
 ChangeLog        |    7 +++++++
 ping/Makefile.am |   10 ++++------
 src/Makefile.am  |   24 ++++++++----------------
 3 files changed, 19 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



