From MAILER-DAEMON Tue Nov 03 13:19:10 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N5NyI-0004T4-4a
	for mharc-commit-inetutils@gnu.org; Tue, 03 Nov 2009 13:19:10 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N5NyF-0004SE-Ll
	for commit-inetutils@gnu.org; Tue, 03 Nov 2009 13:19:07 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N5NyE-0004Rv-S1
	for commit-inetutils@gnu.org; Tue, 03 Nov 2009 13:19:07 -0500
Received: from [199.232.76.173] (port=45101 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N5NyE-0004Rs-GP
	for commit-inetutils@gnu.org; Tue, 03 Nov 2009 13:19:06 -0500
Received: from savannah.gnu.org ([199.232.41.3]:45097 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 <INVALID.NOREPLY@gnu.org>)
	id 1N5Ny9-0005n6-7u
	for commit-inetutils@gnu.org; Tue, 03 Nov 2009 13:19:06 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N5Ny8-0001lA-IA
	for commit-inetutils@gnu.org; Tue, 03 Nov 2009 18:19:00 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N5Ny7-0001kI-PB
	for commit-inetutils@gnu.org; Tue, 03 Nov 2009 18:19:00 +0000
From: "Alfred M. Szmidt" <ams@gnu.org>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d4157abcfb08634a968c98a874c9d895f7cf2681
X-Git-Newrev: 9640d7fca3ddf00e8d7bab9eb7cf36fcc3570678
Message-Id: <E1N5Ny7-0001kI-PB@cvs.savannah.gnu.org>
Date: Tue, 03 Nov 2009 18:18:59 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. release_1_5-217-g9640d7f
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, 03 Nov 2009 18:19: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 ".

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

The branch, master has been updated
       via  9640d7fca3ddf00e8d7bab9eb7cf36fcc3570678 (commit)
       via  0d90e77183b07ba34acd3a2c3cbc11874e180a18 (commit)
       via  5115582bbdcd12139a822d6e673d9108ab58c383 (commit)
       via  8481c26150a0dfab7a94011206caf7508d4d690a (commit)
       via  cf97d42baff1ae1d363c356ba3d77ad5b61f3d9e (commit)
       via  3876c01182637c08f5a6fab468d9b5795941fdf5 (commit)
       via  6f6baee264cfe98e001f549ac849a9584795d8c6 (commit)
       via  988cc480b9971aae65041c60c845d61639bad536 (commit)
       via  062055dd6d84fc9b1aed6aada7a91a2002c92277 (commit)
       via  0ae726abd881d32991638fddfcc6504f8c6448e9 (commit)
       via  97b5e979b994505d6d763398dfe9076512101196 (commit)
       via  8563a04321ddf56b4ee593cf671eb778777b0bde (commit)
       via  98b2e84e9cac131dc62663b34665fb55be65fc61 (commit)
       via  65c92e0bdbab3fbc3e66e5ab7e170808591bfb7d (commit)
       via  907d379e650f1096b6b09da25799982028fe8c58 (commit)
       via  c8cec47bc910acec7b8ed3c0ada372d56fefa3f6 (commit)
       via  bf37ef653c59213bbcd95aafbdc74a60d46d5fb9 (commit)
       via  2dc5f81e95e69145be0d88d4274a15ed872f85af (commit)
       via  51f068c64d64866f3b178f1c36f3a113259b3902 (commit)
       via  cd839cfe5e429bc77c686047cfceb05af82a6618 (commit)
       via  a79c62bdc3eb2bbd08b483f214d34afb89701456 (commit)
       via  37ad330b67bc86003cafcd5bc8846836e4b92ebd (commit)
      from  d4157abcfb08634a968c98a874c9d895f7cf2681 (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 -----------------------------------------------------------------
commit 9640d7fca3ddf00e8d7bab9eb7cf36fcc3570678
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Nov 3 19:23:33 2009 +0100

    Remove trailing whitespaces.  (silent change)

commit 0d90e77183b07ba34acd3a2c3cbc11874e180a18
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Thu Oct 29 23:41:14 2009 +0100

    hostname/hostname.c (argp_options): Fixed typo.

commit 5115582bbdcd12139a822d6e673d9108ab58c383
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Thu Oct 29 23:35:55 2009 +0100

    Updated.  (silent change, generated files from gnulib-import)

commit 8481c26150a0dfab7a94011206caf7508d4d690a
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Thu Oct 29 23:35:02 2009 +0100

    rlogind/rlogind.c, telnetd/pty.c: Include <pty.h>.

commit cf97d42baff1ae1d363c356ba3d77ad5b61f3d9e
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Thu Oct 29 23:33:58 2009 +0100

    rexecd/rexecd.c (doit): Added forward declaration.

commit 3876c01182637c08f5a6fab468d9b5795941fdf5
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Thu Oct 29 23:33:03 2009 +0100

    Ignore TAGS files.

commit 6f6baee264cfe98e001f549ac849a9584795d8c6
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Thu Oct 29 23:21:51 2009 +0100

    Don't use obsolete getopt module from gnulib.

commit 988cc480b9971aae65041c60c845d61639bad536
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Thu Oct 29 23:19:18 2009 +0100

    Updated.  (silent change)

commit 062055dd6d84fc9b1aed6aada7a91a2002c92277
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Thu Oct 29 23:03:23 2009 +0100

    Added copyright notice.  (silent change)

commit 0ae726abd881d32991638fddfcc6504f8c6448e9
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Thu Oct 29 22:15:41 2009 +0100

    Updated copyright notice.  (silent change)

commit 97b5e979b994505d6d763398dfe9076512101196
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Thu Oct 29 09:55:43 2009 +0100

    Removed spurious tabs/spaces.  (silent change)

commit 8563a04321ddf56b4ee593cf671eb778777b0bde
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Oct 27 08:41:06 2009 +0100

    Updated.  (silent change)

commit 98b2e84e9cac131dc62663b34665fb55be65fc61
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 26 21:38:32 2009 +0100

    Removed erronous tabs/spaces.

commit 65c92e0bdbab3fbc3e66e5ab7e170808591bfb7d
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 26 21:36:26 2009 +0100

    Removed obsolete BSD 4.2 code.

commit 907d379e650f1096b6b09da25799982028fe8c58
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 26 21:15:03 2009 +0100

    Merge traceroute/traceroute.h into traceroute/traceroute.c.

commit c8cec47bc910acec7b8ed3c0ada372d56fefa3f6
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 26 21:08:53 2009 +0100

    Merged rcp into a single file.

commit bf37ef653c59213bbcd95aafbdc74a60d46d5fb9
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 26 20:57:12 2009 +0100

    Moved FSF copyright notice to the top.  (silent change)

commit 2dc5f81e95e69145be0d88d4274a15ed872f85af
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Fri Oct 23 09:47:00 2009 +0200

    Removed stale README files.

commit 51f068c64d64866f3b178f1c36f3a113259b3902
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Fri Oct 23 09:44:45 2009 +0200

    Updated TODO.

commit cd839cfe5e429bc77c686047cfceb05af82a6618
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Fri Oct 23 09:34:52 2009 +0200

    Renamed `gwhois' to `whois'.

commit a79c62bdc3eb2bbd08b483f214d34afb89701456
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Fri Oct 23 09:07:48 2009 +0200

    .gitignore (ChangeLog): Removed from list.

commit 37ad330b67bc86003cafcd5bc8846836e4b92ebd
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Fri Oct 23 09:07:16 2009 +0200

    rexec/.gitignore: New file.

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

Summary of changes:
 .gitignore                         |    2 +-
 ChangeLog                          |  126 +++++++++++++++++++++++-
 ChangeLog.0                        |  170 ++++++++++++++++----------------
 Makefile.am                        |   25 +++---
 NEWS                               |    7 +-
 README-alpha                       |   26 +++---
 TODO                               |   58 +++++++++++
 am/check_macro.m4                  |   29 +++---
 am/check_member.m4                 |   26 +++---
 am/check_weak_refs.m4              |   26 +++---
 am/config_paths.m4                 |   30 +++---
 am/enable.m4                       |   28 +++---
 am/flushleft.m4                    |   26 +++---
 am/krb5.m4                         |   26 +++---
 am/libcurses.m4                    |   28 +++---
 am/result.m4                       |   26 +++---
 bootstrap.conf                     |   33 +++---
 configure.ac                       |   29 +++---
 doc/.gitignore                     |    2 +-
 doc/Makefile.am                    |   23 +++--
 doc/inetutils.texi                 |    4 +-
 ftp/Makefile.am                    |   23 +++--
 ftp/cmds.c                         |   41 ++++----
 ftp/cmdtab.c                       |   21 ++++-
 ftp/domacro.c                      |   21 ++++-
 ftp/extern.h                       |   29 +++++-
 ftp/ftp.c                          |   41 ++++----
 ftp/ftp_var.h                      |   43 ++++-----
 ftp/main.c                         |   41 ++++----
 ftp/ruserpass.c                    |   42 ++++----
 ftpd/Makefile.am                   |   23 +++--
 ftpd/README.sec                    |   32 ------
 ftpd/auth.c                        |   19 ++++
 ftpd/conf.c                        |   19 ++++
 ftpd/extern.h                      |   46 ++++-----
 ftpd/ftpcmd.y                      |    4 +-
 ftpd/ftpd.c                        |   42 ++++----
 ftpd/logwtmp.c                     |   43 +++-----
 ftpd/pam.c                         |   19 ++++
 ftpd/popen.c                       |   47 +++++-----
 ftpd/server_mode.c                 |   19 ++++
 gwhois/README                      |   31 ------
 gwhois/TODO                        |    9 --
 headers/Makefile.am                |   23 +++--
 headers/shishi_def.h               |   28 +++---
 headers/tftpsubs.h                 |   23 ++++-
 hostname/Makefile.am               |   22 ++--
 hostname/hostname.c                |   33 +++---
 ifconfig/Makefile.am               |   23 +++--
 ifconfig/TODO                      |   26 -----
 ifconfig/changeif.c                |   29 +++---
 ifconfig/flags.c                   |   29 +++---
 ifconfig/flags.h                   |   31 +++---
 ifconfig/if_index.c                |   35 ++++---
 ifconfig/if_index.h                |   28 +++---
 ifconfig/ifconfig.c                |   28 +++---
 ifconfig/ifconfig.h                |   30 +++---
 ifconfig/options.c                 |   28 +++---
 ifconfig/options.h                 |   30 +++---
 ifconfig/printif.c                 |   28 +++---
 ifconfig/printif.h                 |   30 +++---
 ifconfig/system.c                  |   19 ++++
 ifconfig/system.h                  |   30 +++---
 ifconfig/system/Makefile.am        |   23 +++--
 ifconfig/system/generic.c          |   29 +++---
 ifconfig/system/generic.h          |   32 +++---
 ifconfig/system/hpux.c             |   29 +++---
 ifconfig/system/hpux.h             |   31 +++---
 ifconfig/system/linux.c            |   29 +++---
 ifconfig/system/linux.h            |   31 +++---
 ifconfig/system/osf.c              |   31 +++---
 ifconfig/system/osf.h              |   31 +++---
 ifconfig/system/qnx.c              |   31 +++---
 ifconfig/system/qnx.h              |   31 +++---
 ifconfig/system/solaris.c          |   29 +++---
 ifconfig/system/solaris.h          |   31 +++---
 inetd/Makefile.am                  |   23 +++--
 inetd/inetd.c                      |   36 ++++----
 lib/.gitignore                     |   11 ++-
 lib/Makefile.am                    |   36 ++++----
 libicmp/Makefile.am                |   23 +++--
 libicmp/TODO                       |    1 -
 libicmp/icmp.h                     |   28 +++---
 libicmp/icmp_address.c             |   28 +++---
 libicmp/icmp_cksum.c               |   28 +++---
 libicmp/icmp_echo.c                |   28 +++---
 libicmp/icmp_timestamp.c           |   28 +++---
 libinetutils/Makefile.am           |   23 +++--
 libinetutils/argcv.c               |   26 +++---
 libinetutils/argcv.h               |   34 ++++---
 libinetutils/cleansess.c           |   29 +++---
 libinetutils/daemon.c              |   23 ++++-
 libinetutils/defauthors.c          |   26 +++---
 libinetutils/des_rw.c              |   23 ++++-
 libinetutils/kcmd.c                |   21 ++++-
 libinetutils/krcmd.c               |   21 ++++-
 libinetutils/libinetutils.h        |   34 +++---
 libinetutils/localhost.c           |   29 +++---
 libinetutils/logwtmp.c             |   29 +++---
 libinetutils/logwtmpko.c           |   19 ++++
 libinetutils/setsig.c              |   29 +++---
 libinetutils/shishi.c              |   26 +++---
 libinetutils/tftpsubs.c            |   21 ++++-
 libinetutils/ttymsg.c              |   21 ++++-
 libinetutils/utmp_init.c           |   59 ++++++++----
 libinetutils/utmp_logout.c         |   59 ++++++++----
 libls/Makefile.am                  |   23 +++--
 libls/cmp.c                        |   28 ++++-
 libls/extern.h                     |   26 ++++-
 libls/fts.c                        |   47 ++++-----
 libls/fts.h                        |   27 ++++--
 libls/ls.c                         |   46 ++++-----
 libls/ls.h                         |   30 ++++--
 libls/print.c                      |   46 ++++-----
 libls/stat_flags.c                 |   24 ++++-
 libls/util.c                       |   28 ++++-
 libtelnet/Makefile.am              |   23 +++--
 libtelnet/auth-proto.h             |   22 ++---
 libtelnet/auth.c                   |   21 ++--
 libtelnet/auth.h                   |   22 ++---
 libtelnet/enc-proto.h              |   22 ++---
 libtelnet/enc_des.c                |   21 ++--
 libtelnet/encrypt.c                |   21 ++--
 libtelnet/encrypt.h                |   22 ++---
 libtelnet/forward.c                |   20 ++--
 libtelnet/genget.c                 |   21 ++--
 libtelnet/genget.h                 |   18 ++++
 libtelnet/getent.c                 |   21 ++--
 libtelnet/kerberos.c               |   21 ++--
 libtelnet/kerberos5.c              |   16 ++--
 libtelnet/key-proto.h              |   22 ++---
 libtelnet/misc-proto.h             |   22 ++---
 libtelnet/misc.c                   |   20 ++--
 libtelnet/misc.h                   |   22 ++---
 libtelnet/read_passwd.c            |   20 ++--
 libtelnet/shishi.c                 |   16 ++--
 logger/Makefile.am                 |   23 +++--
 logger/logger.c                    |   27 +++---
 paths                              |   25 +++---
 ping/Makefile.am                   |   23 +++--
 ping/README.sec                    |   38 -------
 ping/TODO                          |    2 -
 ping/libping.c                     |   27 +++---
 ping/ping.c                        |   29 +++---
 ping/ping.h                        |   27 +++---
 ping/ping6.c                       |   29 +++---
 ping/ping6.h                       |   28 +++---
 ping/ping_address.c                |   28 +++---
 ping/ping_common.c                 |   29 +++---
 ping/ping_common.h                 |   28 +++---
 ping/ping_echo.c                   |   28 +++---
 ping/ping_impl.h                   |   29 +++---
 ping/ping_router.c                 |   28 +++---
 ping/ping_timestamp.c              |   28 +++---
 rcp/Makefile.am                    |   27 +++---
 rcp/extern.h                       |   47 ---------
 rcp/rcp.c                          |  175 +++++++++++++++++++++++++++++----
 rcp/util.c                         |  191 ------------------------------------
 rexec/.gitignore                   |    1 +
 rexec/Makefile.am                  |   22 ++--
 rexec/rexec.c                      |   19 ++--
 rexecd/Makefile.am                 |   23 +++--
 rexecd/rexecd.c                    |   33 +++---
 rlogin/Makefile.am                 |   23 +++--
 rlogin/rlogin.c                    |   41 ++++----
 rlogind/Makefile.am                |   23 +++--
 rlogind/rlogind.c                  |   31 +++---
 rsh/Makefile.am                    |   23 +++--
 rsh/rsh.c                          |   43 ++++----
 rshd/Makefile.am                   |   23 +++--
 rshd/rshd.c                        |   44 ++++----
 syslogd/Makefile.am                |   23 +++--
 syslogd/README.sec                 |   26 -----
 syslogd/syslogd.c                  |   59 +++++------
 talk/Makefile.am                   |   23 +++--
 talk/ctl.c                         |   41 ++++----
 talk/ctl_transact.c                |   41 ++++----
 talk/display.c                     |   41 ++++----
 talk/get_addrs.c                   |   41 ++++----
 talk/get_names.c                   |   41 ++++----
 talk/init_disp.c                   |   41 ++++----
 talk/invite.c                      |   41 ++++----
 talk/io.c                          |   41 ++++----
 talk/look_up.c                     |   41 ++++----
 talk/msgs.c                        |   41 ++++----
 talk/talk.c                        |   41 ++++----
 talk/talk.h                        |   43 ++++-----
 talk/talk_ctl.h                    |   43 ++++-----
 talkd/Makefile.am                  |   23 +++--
 talkd/README.sec                   |   27 -----
 talkd/acl.c                        |   28 +++---
 talkd/announce.c                   |   29 +++---
 talkd/intalkd.h                    |   28 +++---
 talkd/print.c                      |   28 +++---
 talkd/process.c                    |   28 +++---
 talkd/table.c                      |   28 +++---
 talkd/talkd.c                      |   28 +++---
 telnet/Makefile.am                 |   23 +++--
 telnet/README.sec                  |   31 ------
 telnet/authenc.c                   |   23 ++++-
 telnet/commands.c                  |   41 ++++----
 telnet/defines.h                   |   23 ++++-
 telnet/externs.h                   |   43 ++++-----
 telnet/fdset.h                     |   23 ++++-
 telnet/general.h                   |   23 ++++-
 telnet/krb4-proto.h                |   19 ++++
 telnet/main.c                      |   38 ++++----
 telnet/network.c                   |   21 ++++-
 telnet/ring.c                      |   21 ++++-
 telnet/ring.h                      |   44 ++++-----
 telnet/sys_bsd.c                   |   21 ++++-
 telnet/telnet.c                    |   41 ++++----
 telnet/terminal.c                  |   21 ++++-
 telnet/tn3270.c                    |   21 ++++-
 telnet/types.h                     |   23 ++++-
 telnet/utilities.c                 |   41 ++++----
 telnetd/Makefile.am                |   23 +++--
 telnetd/README.sec                 |   11 --
 telnetd/pty.c                      |   29 +++---
 telnetd/slc.c                      |   22 ++++-
 telnetd/state.c                    |   24 ++++-
 telnetd/telnetd.c                  |   30 +++---
 telnetd/telnetd.h                  |   28 +++---
 telnetd/term.c                     |   28 +++---
 telnetd/termstat.c                 |   22 ++++-
 telnetd/utility.c                  |   29 +++---
 tests/Makefile.am                  |   22 ++--
 tests/localhost.c                  |   27 +++---
 tftp/Makefile.am                   |   23 +++--
 tftp/extern.h                      |   23 ++++-
 tftp/main.c                        |   21 ++++-
 tftp/tftp.c                        |   21 ++++-
 tftpd/Makefile.am                  |   23 +++--
 tftpd/tftpd.c                      |   38 ++++----
 traceroute/Makefile.am             |   24 ++---
 traceroute/traceroute.c            |   74 +++++++++-----
 traceroute/traceroute.h            |   57 -----------
 uucpd/Makefile.am                  |   23 +++--
 uucpd/uucpd.c                      |  138 +++++---------------------
 {gwhois => whois}/.gitignore       |    0
 {gwhois => whois}/Makefile.am      |   23 +++--
 {gwhois => whois}/as_del_list      |    0
 {gwhois => whois}/data.h           |   18 ++++
 {gwhois => whois}/ip_del_list      |    0
 {gwhois => whois}/make_as_del.pl   |    1 -
 {gwhois => whois}/make_ip_del.pl   |    1 -
 {gwhois => whois}/make_tld_serv.pl |    1 -
 {gwhois => whois}/tld_serv_list    |    0
 {gwhois => whois}/whois.c          |   51 +++++-----
 {gwhois => whois}/whois.h          |   19 ++++
 250 files changed, 3978 insertions(+), 3523 deletions(-)
 delete mode 100644 ftpd/README.sec
 delete mode 100644 gwhois/README
 delete mode 100644 gwhois/TODO
 delete mode 100644 ifconfig/TODO
 delete mode 100644 libicmp/TODO
 delete mode 100644 ping/README.sec
 delete mode 100644 ping/TODO
 delete mode 100644 rcp/extern.h
 delete mode 100644 rcp/util.c
 create mode 100644 rexec/.gitignore
 delete mode 100644 syslogd/README.sec
 delete mode 100644 talkd/README.sec
 delete mode 100644 telnet/README.sec
 delete mode 100644 telnetd/README.sec
 delete mode 100644 traceroute/traceroute.h
 rename {gwhois => whois}/.gitignore (100%)
 rename {gwhois => whois}/Makefile.am (66%)
 rename {gwhois => whois}/as_del_list (100%)
 rename {gwhois => whois}/data.h (75%)
 rename {gwhois => whois}/ip_del_list (100%)
 rename {gwhois => whois}/make_as_del.pl (99%)
 rename {gwhois => whois}/make_ip_del.pl (99%)
 rename {gwhois => whois}/make_tld_serv.pl (99%)
 rename {gwhois => whois}/tld_serv_list (100%)
 rename {gwhois => whois}/whois.c (95%)
 rename {gwhois => whois}/whois.h (67%)

diff --git a/.gitignore b/.gitignore
index 75a29ed..81fd269 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,12 +5,12 @@
 *.o
 *.so
 *~
+TAGS
 .bootstrap
 .deps
 .emacs*
 .libs
 ABOUT-NLS
-ChangeLog
 INSTALL
 Makefile
 Makefile.in
diff --git a/ChangeLog b/ChangeLog
index f89de16..27ab872 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,123 @@
+2009-10-29  Alfred M. Szmidt  <ams@gnu.org>
+
+	* hostname/hostname.c (argp_options): Fixed typo.
+
+2009-10-29  Alfred M. Szmidt  <ams@gnu.org>
+
+	* rlogind/rlogind.c, telnetd/pty.c: Include <pty.h>.
+
+2009-10-29  Alfred M. Szmidt  <ams@gnu.org>
+
+	* rexecd/rexecd.c (doit): Added forward declaration.
+
+2009-10-29  Alfred M. Szmidt  <ams@gnu.org>
+
+	* .gitignore (TAGS): Added to list.
+
+2009-10-29  Alfred M. Szmidt  <ams@gnu.org>
+
+	* bootstrap.conf (gnulib_modules): Use `getopt-gnu' instead of
+	`getopt'.
+
+2009-10-26  Alfred M. Szmidt  <ams@gnu.org>
+
+	* uucpd/uucpd.c [BSD4_2]: Removed obsolete code.
+	(main) [BSDINETD]: Likewise.
+	(doit) [BSD4_2]: Likewise.
+	(usage_str): Variable removed.
+	(usage): Function removed.
+
+2009-10-26  Alfred M. Szmidt  <ams@gnu.org>
+
+	* traceroute/traceroute.c: Don't include "traceroute.h".
+	(TRACE_UDP_PORT, TRACE_TTL): New macros.
+	(TRACE_UDP, TRACE_ICMP, TRACE_1393): New enums.
+	(trace): New struct.
+	(trace_init, trace_inc_ttl, trace_inc_port, trace_port)
+	(trace_read, trace_write, trace_udp_sock, trace_icmp_sock): Added
+	forward declarations.
+	* traceroute/traceroute.h: File removed.
+	* traceroute/Makefile.am (noinst_HEADERS): Variable removed.
+
+2009-10-26  Alfred M. Szmidt  <ams@gnu.org>
+
+	* rcp/rcp.c: Include <sys/wait.h>.  Removed include for
+	"extern.h".
+	(BUF): New structure (from rcp/util.c).
+	(allocbuf, colon, lostconn, nospace, okname, run_err, susystem)
+	(verifydir): New functions (from rcp/util.c).
+	* rcp/extern.h, rcp/util.c: Files removed.
+	* rcp/Makefile.am (rcp_SOURCES): Removed `util.c'.
+	(noinst_HEADERS): Variable removed.
+
+2009-10-23  Alfred M. Szmidt  <ams@gnu.org>
+
+	* ftpd/README.sec, ping/README.sec, syslogd/README.sec,
+	talkd/README.sec, telnet/README.sec, telnetd/README.sec: Files
+	removed.
+
+	* whois/README: File removed.
+
+2009-10-23  Alfred M. Szmidt  <ams@gnu.org>
+
+	* whois/TODO, ping/TODO, libicmp/TODO, ifconfig/TODO: Files
+	removed (content merged into top-level TODO).
+	* TODO: Updated.
+
+2009-10-23  Alfred M. Szmidt  <ams@gnu.org>
+
+	Renamed `gwhois' to `whois'.
+
+	* Makefile.am (SUBDIRS): Renamed `gwhois' to `whois'
+	* configure.ac: Likewise.
+
+	* gwhois/.gitignore: Renamed file to ...
+	* whois/.gitignore: ... this.
+
+	* gwhois/Makefile.am: Renamed file to ...
+	* whois/Makefile.am: ... this.
+
+	* gwhois/README: Renamed file to ...
+	* whois/README: ... this.
+
+	* gwhois/TODO: Renamed file to ...
+	* whois/TODO: ... this.
+
+	* gwhois/as_del_list: Renamed file to ...
+	* whois/as_del_list: ... this.
+
+	* gwhois/data.h: Renamed file to ...
+	* whois/data.h: ... this.
+
+	* gwhois/ip_del_list: Renamed file to ...
+	* whois/ip_del_list: ... this.
+
+	* gwhois/make_as_del.pl: Renamed file to ...
+	* whois/make_as_del.pl: ... this.
+
+	* gwhois/make_ip_del.pl: Renamed file to ...
+	* whois/make_ip_del.pl: ... this.
+
+	* gwhois/make_tld_serv.pl: Renamed file to ...
+	* whois/make_tld_serv.pl: ... this.
+
+	* gwhois/tld_serv_list: Renamed file to ...
+	* whois/tld_serv_list: ... this.
+
+	* gwhois/whois.c: Renamed file to ...
+	* whois/whois.c: ... this.
+
+	* gwhois/whois.h: Renamed file to ...
+	* whois/whois.h: ... this.
+
+2009-10-23  Alfred M. Szmidt  <ams@gnu.org>
+
+	* .gitignore (ChangeLog): Removed from list.
+
+2009-10-23  Alfred M. Szmidt  <ams@gnu.org>
+
+	* rexec/.gitignore: New file.
+
 2009-10-20  Rakesh Pandit  <rakesh@fedoraproject.org>
 
 	* ping/ping.c (parse_opt): Handle `--debug' and `--ignore-routing'
@@ -54,7 +174,7 @@
 2009-08-18  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	Fix possible array overflow in ping.
-	
+
 	* ping/ping.h (_C_BIT,_C_MASK)
 	(_PING_SET,_PING_CLR,_PING_TST): Remove in favor of
 	ping_common.h
@@ -68,7 +188,7 @@
 2009-07-19  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	Fix net-tool output format in ifconfig.
-	
+
 	* configure.ac: Check for struct ifreq.ifr_map
 	* paths: Add PATH_PROCNET_DEV
 	* ifconfig/Makefile.am (AM_CPPFLAGS): Add $(PATHDEF_PROCNET_DEV)
@@ -90,7 +210,7 @@
 	* ping/ping_echo.c: Likewise.
 	* ping/ping_router.c: Likewise.
 	* ping/ping_timestamp.c: Likewise.
-	
+
 2009-07-10  Giuseppe Scrivano <gscrivano@gnu.org>
             Alfred M. Szmidt <ams@gnu.org>
 
diff --git a/ChangeLog.0 b/ChangeLog.0
index c9eb3b5..ff362d3 100644
--- a/ChangeLog.0
+++ b/ChangeLog.0
@@ -8,7 +8,7 @@ Sun Apr 26 19:37:09 1998  Joel N. Weber II  <nemo@nautilus.sub>
 
 	* syslogd/syslogd.c (logmsg): When opening the console device,
  	pass the O_NOCTTY flag to avoid acquiring a controlling tty.
-	
+
 	(fprintlog): When opening a log file, pass the O_CREAT flags and
 	O_NOCTTY flags.
 	(cfline): Likewise.
@@ -32,39 +32,39 @@ Fri Apr 10 11:13:51 1998  Joel N. Weber II  <nemo@nautilus.sub>
 Fri Apr 10 19:53:37 1998  Joel N. Weber II  <nemo@koa.iolani.honolulu.hi.us>
 
 	* libinetutils/opieclient.c: Random cosmetic changes.
-	
+
 	[HAVE_CONFIG_H]: Inclued config.h.
 
 Fri Apr 10 11:13:51 1998  Joel N. Weber II  <nemo@nautilus.sub>
 
 	* whois/main.c (main): Use inetutils_package and inetutils_version
  	rather than PACKAGE and VERSION.
-	
+
 	Check the compiled in config file as the second-to-last resort.
-	
+
 	(config_buffer_netwhois): New function, mostly created by ripping code
 	out of config_file_netwhois.
-	
+
 	(config_file_netwhois): Use config_buffer_netwhois.
 
 	* whois/Makefile.am (whois_SOURCES): Added config.c.
-	
+
 	(EXTRA_DIST): Added gen-config-c.
-	
+
 	(config.c): Added a rule to generate it from whois-servers using the
 	gen-config-c script.
 
 	* Makefile.am (SUBDIRS): Added ping.
 
 	* configure.in: Call IU_ENABLE_CLIENT and AC_SUBST for whois.
-	
+
 	Update the comment above the AC_SUBST calls for BUILD_<whatever>;
  	the change of moving AC_SUBST out of IU_ENABLE_FOO wasn't actually
  	necissary.
-	
+
 	Test for -lz, since I will probably add code that uses it
  	eventually.
-	
+
 	Supply a value for inetdaemondir.
 
 Fri Apr  3 17:11:44 1998  Joel N. Weber II  <nemo@koa.iolani.honolulu.hi.us>
@@ -83,9 +83,9 @@ Thu Mar 26 20:40:06 1998  Joel N. Weber II  <nemo@nautilus.sub>
 
 	* glob/Makefile.am (AUTOMAKE_OPTIONS): Removed; the options are
  	set adaquaely in ../Makefile.am.
-	
+
 	(noinst_LIBRARIES): Use @BUILD_LIBGLOB@ rather than libglob.a
-	
+
 	(EXTRA_LIBRARIES): Added libglob.a
 
 	* Makefile.am (DISTCLEANFILES): Added `include/*.h include/*/*.h
@@ -94,7 +94,7 @@ Thu Mar 26 20:40:06 1998  Joel N. Weber II  <nemo@nautilus.sub>
 	* acinclude.m4 (IU_ENABLE_FOO): Fix syntax errors.  Remove call to
  	AC_SUBST; there are now many explicit calls to AC_SUBST to make
  	automake happy.
-	
+
 	(IU_ENABLE_CLIENT): Use `clients' rather than `client' as the
 	second arg.
 	(IU_ENABLE_SERVER): Use `servers' rather than `server' as the
@@ -110,21 +110,21 @@ Thu Mar 26 20:40:06 1998  Joel N. Weber II  <nemo@nautilus.sub>
  	changing the version number will not force me to wait 20+ minutes
  	(or so it seems) for the inetutils to be rebuilt after I change
  	the version number.
-	
+
 	Rearrange a few macro calls that were added for the glob library
  	so that autoconf doesn't complain that they're out of order.
-	
+
 	Removed some more of the old SUBDIRS cruft.
-	
+
 	When setting enable_talk to `no' after not finding curses, also
  	set BUILD_TALK to the empty string.
-	
+
 	Set the BUILD_LIBGLOB variable appropriately.
 
 	* ping/ping.c (version.h): Include it.
-	
+
 	(show_usage): Use inetutils_bugaddr.
-	
+
 	(main): Use inetutils_version rather than VERSION.  Don't use
 	GNU_PACKAGE.
 
@@ -147,16 +147,16 @@ Thu Mar 26 00:08:39 1998  Joel N. Weber II  <nemo@nautilus.sub>
 	* ftp/Makefile.am (LDADD): Added `$(LIBTERMCAP)'.
 
 	* Makefile.am (SUBDIRS): Added whois.
-	
+
 	(DISTCLEANFILES): Added `pathdefs.make paths.defs'.
 
 	* configure.in: Removed some old cruft related to the old system
  	of not building some directoies.
-	
+
 	Added calls to IU_ENABLE_SERVER and IU_ENABLE_CLIENT.
-	
+
 	Added checks for libtermcap, libreadline, and libopie.
-	
+
 	Generate whois/Makefile.
 
 	* acinclude.m4 (IU_ENABLE_FOO): New AC_DEFUN.
@@ -168,13 +168,13 @@ Tue Mar 24 11:46:55 1998  Joel N. Weber II  <nemo@koa.iolani.honolulu.hi.us>
 	* Ran the command for i in `grep man_MANS */Makefile.am|awk -F: '{
 	print $1 }'`; do (echo;echo 'EXTRA_DIST = $(man_MANS)') >> $i;
 	done
-	
+
 	* configure.in (AM_INIT_AUTOMAKE): Added a third argument to
  	suppress VERSION and PACKAGE symbols from appearing in config.h
-	
+
 	Added much code that was formerly in glob/configure.in, before I
  	removed that file.
-	
+
 	Add glob/Makefile to the `AC_OUTPUT' call.
 
 	* headers/Makefile.am (EXTRA_DIST): Added `confpaths.h.in'.
@@ -182,41 +182,41 @@ Tue Mar 24 11:46:55 1998  Joel N. Weber II  <nemo@koa.iolani.honolulu.hi.us>
 	* ftp/Makefile.am (LDADD): Added `$(LIBGLOB)'.
 
 	* Makefile.am (EXTRA_DIST): Added paths.
-	
+
 	(SUBDIRS): Added glob.
 
 	* uucpd/Makefile.am (INCLUDES): Added `$(PATHDEF_TTY)'.
-	
+
 	(LDADD): Added `-L../libinetutils -linetutils'.
 
 	* telnetd/Makefile.am: Added a line that reads `@PATHDEFS_MAKE@'.
-	
+
 	(INCLUDES): Added `$(PATHDEF_TTY) $(PATHDEF_LOGIN)'.
 
 	* talkd/Makefile.am: Added a line that reads `@PATHDEFS_MAKE@'.
-	
+
 	(INCLUDES): Added `$(PATHDEF_DEV)'.
 
 	* syslogd/Makefile.am: Added a line that reads `@PATHDEFS_MAKE@'.
-	
+
 	(INCLUDES): Added `$(PATHDEF_LOG) $(PATHDEF_LOGCONF) $(PATHDEF_LOGPID)
 	$(PATHDEF_CONSOLE)'.
 
 	* rshd/Makefile.am (INCLUDES): Added `$(PATHDEF_BSHELL)
  	$(PATHDEF_NOLOGIN) $(PATHDEF_DEFPATH)'.
-	
+
 	Added a line reading `@PATHDEFS_MAKE@'.
 
 	* rlogind/Makefile.am (INCLUDES): Added `$(PATHDEF_DEV)
  	$(PATHDEF_LOGIN)'.
-	
+
 	Added a line reading `@PATHDEFS_MAKE@'.
 
 	* rexecd/Makefile.am (INCLUDES): Added `$(PATHDEF_DEFPATH)
  	$(PATHDEF_BSHELL)'.
-	
+
 	(LDADD): Added `-L../libinetutils -linetutils'.
-	
+
 	Added a line reading `@PATHDEFS_MAKE@'.
 
 	* rcp/Makefile.am (INCLUDES): Added `$(PATHDEF_BSHELL)'.
@@ -232,43 +232,43 @@ Tue Mar 24 11:46:55 1998  Joel N. Weber II  <nemo@koa.iolani.honolulu.hi.us>
 
 	* ftp/Makefile.am (INCLUDES): Added `$(PATHDEF_TMP)
  	$(PATHDEF_BSHELL)'.
-	
+
 	Added a line reading `@PATHDEFS_MAKE@'.
 
 Tue Mar 24 00:28:27 1998  Joel N. Weber II  <nemo@nautilus.sub>
 
 	* telnet/Makefile.am (noinst_HEADERS): Remove krb4-proto.h;
  	Kerberos 4 doesn't meet our definition of `free software'.
-	
+
 	(INCLUDES): Add `-DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK'.
-	
+
 	(LDADD): Add `-L../libinetutils -L../libtelnet -linetutils -ltelnet
 	$(LIBTERMCAP) $(LIBCRYPT)'.
-	
+
 	(LIBTERMCAP): Set make variable from coresponding configure variable
 	(LIBCRYPT): Likewise.
 
 	* uucpd/Makefile.am (INCLUDES): Added `$(PATHDEF_UUCICO)'.
-	
+
 	Added a line that reads `@PATHDEFS_MAKE@'.
 
 	* tftpd/Makefile.am (noinst_HEADERS): Removed tftpsubs.h
-	
+
 	(LDADD): Added `-L../libinetutils -linetutils'.
 
 	* tftp/Makefile.am (tftp_SOURCES): Removed tftpsubs.c; that file
  	has been moved to ../libinetutils.
-	
+
 	(noinst_HEADERS): Removed tftpsubs.h; that file has been moved to
 	../headers.
-	
+
 	(LDADD): Added `-L../libinetutils -linetutils'.
 
 Mon Mar 23 11:47:37 1998  Joel N. Weber II  <nemo@nautilus.sub>
 
 	* telnetd/Makefile.am (LIBTERMCAP, LIBCRYPT, LIBUTIL): Set make
  	variables corresponding to the configure variables.
-	
+
 	(LDADD): Added `-L../libinetutils -L../libtelnet -linetutils -ltelnet
 	$(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT)'.
 
@@ -276,7 +276,7 @@ Mon Mar 23 11:47:37 1998  Joel N. Weber II  <nemo@nautilus.sub>
  	-linetutils'.
 
 	* talk/Makefile.am (INCLUDES): Added `$(NCURSES_INCLUDE)'.
-	
+
 	(LDADD): Added `$(LIBCURSES) -L../libinetutils -linetutils'.
 
 	* syslogd/Makefile.am (LDADD): Added `-L../libinetutils
@@ -292,66 +292,66 @@ Mon Mar 23 11:47:37 1998  Joel N. Weber II  <nemo@nautilus.sub>
 
 	* rcp/Makefile.am (INCLUDES): Added `$(PATHDEF_RSH)
  	$(PATHDEF_CP)'.
-	
+
 	(LDADD): Added `-L../libinetutils -linetutils'.
-	
+
 	Added a line `@PATHDEFS_MAKE@'.
 
 	* ftpd/Makefile.am (INCLUDES): Added `$(PATHDEF_FTPWELCOME)
  	$(PATHDEF_FTPUSERS) $(PATHDEF_FTPLOGINMESG)'.
-	
+
 	(LDADD): Added `-L../libinetutils -L../libtelnet -linetutils -ltelnet'.
-	
+
 	Added the line `@PATHDEFS_MAKE@'.
 
 	* ftp/Makefile.am (LDADD): Added ../libinetutils -linetutils.
 
 	* libinetutils/Makefile.am (libinetutils_a_SOURCES): Removed
  	version.c and all the files covered by @LIBOBS@
-	
+
 	(libinetutils_a_LIBADD): Add @LIBOBJS@
-	
+
 	(noinst_HEADERS): Removed version.h
 
 	* configure.in: Removed some old, commented-out cruft.
-	
+
 	Removed some old code related to the @DIRS@ hack; that code will
  	not be needed in the future.
-	
+
 	Reinstalled some code that deals with having both a `headers' and
  	`include' tree.
-	
+
 	Removed the iruserok from one of the two places where it appeared
  	in the AC_REPLACE_FUNCS call.
-	
+
 	Reinstalled the line `AC_REPLACE_FUNCS(revoke)'; it had been
  	commented out, but I see no ChangeLog entry explaining why, and I
  	suspect that it should not have been commented out.
-	
+
 	Changed the message that was `checking for system glob is ok' to
  	`checking for ok system glob'.
-	
+
 	Call `AC_SUBST(VERSION)'.
-	
+
 	In the call to AC_OUTPUT, added version.h.
 
 Sun Mar 22 16:13:49 1998  Joel N. Weber II  <nemo@nautilus.sub>
 
 	* Makefile.am (SUBDIRS): Use an explicit list, rather than @DIRS@.
-	
+
 	Removed some random cruft that I'd previously mistakenly added
  	that is not necissary.
 
 	* headers/Makefile.am (EXTRA_DIST): Renamed variable from
  	noinst_HEADERS.  Added tftpsubs.h.  Changed version.h to
  	version.h.in.
-	
+
 	(dist-hook): Added to distribute some files in the arpa and protocols
 	directories.
 
 	* inetd/Makefile.am (INCLUDES): Use $(PATHDEF_INETDCONF) instead
  	of the old hardcoded value.
-	
+
 	Added a line that reads `@PATHDEFS_MAKE@'
 
 Mon Mar  9 17:04:55 1998  Joel N. Weber II  <nemo@koa.iolani.honolulu.hi.us>
@@ -541,12 +541,12 @@ Mon Mar  3 17:56:36 1997  Philippe De Muyter  <phdm@info.ucl.ac.be>
 	* libinetutils/krcmd.c, libinetutils/kcmd.c, libinetutils/des_rw.c:
 	New files (moved from rlogin directory).
 	* rlogin/krcmd.c, rlogin/kcmd.c, rlogin/des_rw.c: Files removed
-	(moved to libinetutils directory). 
+	(moved to libinetutils directory).
 	* libinetutils/Makefile.in (SRCS): Add krcmd.c, kcmd.c, & des_rw.c.
 	(OBJS): Add krcmd.o, kcmd.o, & des_rw.o.
 
 	* rlogin/kcmd.c: Protect whole file with #ifdef KERBEROS.
-	
+
 	From Alexandre Oliva <oliva@dcc.unicamp.br>:
 	* syslogd/syslogd.c (cfline): Remove declaration of hstrerror.
 	* telnetd/utility.c (fatalperror): Remove declaration of strerror.
@@ -563,7 +563,7 @@ Mon Mar  3 17:56:36 1997  Philippe De Muyter  <phdm@info.ucl.ac.be>
 	(rlogin): New rule.
 	* configure.in: If authentication is enabled, also define KERBEROS.
 	* headers/acconfig.h (KERBEROS): New define slot.
-	
+
 	* libinetutils/version.c (inetutils_version): Change to `1.3.1'.
 
 1997-09-10  Miles Bader  <miles@gnu.ai.mit.edu>
@@ -577,7 +577,7 @@ Mon Mar  3 17:56:36 1997  Philippe De Muyter  <phdm@info.ucl.ac.be>
 	From Martin Buck <Martin-2.Buck@student.uni-ulm.de>:
 	* telnet/sys_bsd.c (TerminalNewMode): Don't limit to 7-bits when
 	not in binary mode.
-	
+
 1997-07-28  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* ftp/ftp.c (recvrequest, gunique): Get rid of
@@ -701,13 +701,13 @@ Tue Feb 18 20:14:48 1997  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 	* ftpd/ftpd.c: Likewise.  Also handle missing st_blksize member.
 	* headers/acconfig.h: Normalize variable argument list usage.
 	Also add support to handle missing st_blksize member.
-	* libinetutils/snprintf.c: Normalize variable argument list usage. 
+	* libinetutils/snprintf.c: Normalize variable argument list usage.
 	* libinetutils/snprintf.h: Likewise.  Also constify DATA.pf member.
 	* rcp/util.c: Handle missing st_blksize member.
 	* rexecd/rexecd.c: Make environ extern to avoid link time conflicts.
 	* rshd/rshd.c: Likewise.
 	* telnetd/ext.h: Make terminaltype and line be extern to avoid
-	link time conflicts. 
+	link time conflicts.
 	* telnetd/sys_term.c (rmut): protect use of ut_host member.
 	* telnetd/telnetd.c (main, doit): Likewise.
 	(utmp_len): Only declare if HAVE_UTMP_UT_HOST.
@@ -715,7 +715,7 @@ Tue Feb 18 20:14:48 1997  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 	* tftp/tftp.c (toplevel): Duplicate definition removed.
 	* uucpd/uucpd.c (dologout): Remove unused status variable.  Add a
 	case for HAVE_WAITPID.
-	
+
 Tue Feb 18 01:13:16 1997  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	From Alain Magloire <alain.magloire@rcsm.ee.mcgill.ca>:
@@ -878,7 +878,7 @@ Fri Jan 24 14:17:08 1997  Miles Bader  <miles@gnu.ai.mit.edu>
 	CPPFLAGS-ttymsg.c, CPPFLAGS-cleansess.c, CPPFLAGS-daemon.c):
 	New variables.
 	(CPPFLAGS): Variable removed.
-	
+
 	* telnet/commands.c (set_mode): Renamed from setmode, to avoid
  	conflict with netbsd <unistd.h>; all references changed.
   	(clear_mode): Renamed from clearmode, for consistency with
@@ -889,7 +889,7 @@ Fri Jan 24 14:17:08 1997  Miles Bader  <miles@gnu.ai.mit.edu>
 	termcap library when it exists.
 	(IU_LIB_CURSES): Special case ncurses (it never requires termcap).
 	(_iu_curses_needs_termcap): Macro removed.
-	
+
 	* uucpd/uucpd.c (doit): Use PATH_UUCICO instead of _PATH_UUCICO.
 	(dologin): Use PATH_LASTLOG instead of _PATH_LASTLOG.
 	[HAVE_UTMP_H] <utmp.h>: New include.
@@ -945,7 +945,7 @@ Mon Jan 20 20:35:53 1997  Miles Bader  <miles@gnu.ai.mit.edu>
 	* rsh/rsh.c (main): Always use sigset_t & OSIGS & SIGS variables,
 	and pass a pointer to the talk function.
 	(talk): Always use a pointer for the OSIGS arg (was OMASK).
-	
+
 	* headers/acconfig.h (HAVE_UTMP_UT_TV, sigset_t): Add define slots.
 
 	* telnetd/sys_term.c (rmut): Use HAVE_WTMP_UT_TV rather than
@@ -962,7 +962,7 @@ Wed Jan 15 16:52:31 1997  Miles Bader  <miles@gnu.ai.mit.edu>
 Mon Jan 20 19:55:30 1997  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* ftp/extern.h (command): Constify fmt argument.
-	
+
 	* ftp/ftp.c (command): Normalize variable argument list usage.
   	Require both HAVE_STDARG_H && __STDC__==1 to allow inclusion of
  	<stdarg.h> and use of ellipses, failing either we fall back on
@@ -1104,7 +1104,7 @@ Fri Jan 10 14:22:18 1997  Miles Bader  <miles@gnu.ai.mit.edu>
 	* configure.in: Add check for the special stuff in <syslog.h>
 	enabled by defining SYSLOG_NAMES.
 	* headers/acconfig.h (HAVE_SYSLOG_INTERNAL): New define slot.
-	
+
 	* iumacros.m4 (IO_CHECK_MACRO): Quote arguments to IU_RESULT_ACTIONS.
 
 Wed Jan  8 14:55:47 1997  Miles Bader  <miles@gnu.ai.mit.edu>
@@ -1156,7 +1156,7 @@ Tue Jan  7 13:10:05 1997  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 	* rshd/rshd.c: Add alloca() support and cast the result of
 	alloca().  Also test and include sys/filio.h.
 	* rlogind/rlogind.c: Likewise for sys/filio.h. Test and include
-	sys/stream.h, sys/tty.h, sys/ptyvar.h, and sys/sockio.h. 
+	sys/stream.h, sys/tty.h, sys/ptyvar.h, and sys/sockio.h.
 	* rexecd/rexecd.c: Likewise for filio.h.
 	* tftp/tftpsubs.c: Likewise.
 	* rsh/rsh.c: Likewise.
@@ -1169,7 +1169,7 @@ Tue Jan  7 15:33:14 1997  Miles Bader  <miles@gnu.ai.mit.edu>
 	* libinetutils/revoke.c: New file.
 	(AC_REPLACE_FUNCS): Add revoke.
 	* libinetutils/Makefile.in (SRCS): Add revoke.c.
-	
+
 	* libinetutils/login_tty.c: New file.
 	* configure.in (AC_REPLACE_FUNCS): Add login_tty.
 	(AC_CHECK_FUNCS): Add setsid.
@@ -1241,7 +1241,7 @@ Sat Jan  4 20:05:29 1997  Miles Bader  <miles@gnu.ai.mit.edu>
 Fri Jan  3 17:50:51 1997  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* libinetutils/memset.c, libinetutils/memmove.c,
-	libinetutils/setenv.c: New files. 
+	libinetutils/setenv.c: New files.
 	* headers/acconfig.h
 	[!HAVE_MEMCPY] (memcpy): Define to use memmove.
 	[!HAVE_BCOPY] (bcopy): Define to use memmove.
@@ -1377,7 +1377,7 @@ Mon Oct 21 16:21:15 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* ftpd/ftpd.c (inetutils_version): Declaration removed.
 	"version.h": New include.
-	
+
 Fri Sep 27 13:07:03 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* libinetutils/version.c (inetutils_bugaddr): New variable.
@@ -1452,7 +1452,7 @@ Thu Aug 15 22:29:46 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 	* logwtmp.c: File removed.
 	* configure.in: Add check for errno being declared.
 	* libinetutils/logwtmp.c [!HAVE_ERRNO_DECL] (errno): New decl.
-	[HAVE_ERRNO_H] <errno.h>: New 
+	[HAVE_ERRNO_H] <errno.h>: New
 	[KEEP_OPEN] Add code to define `logwtmp_keep_open' version.
 	* libinetutils/logwtmp.c <sys/fcntl.h>: New include.
 	* libinetutils/Makefile.in (CPPFLAGS): Add $(PATHDEF_WTMP) and
@@ -1548,7 +1548,7 @@ Tue Aug  6 01:44:37 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 	* rcp/util.c (susystem): Likewise.
 	* rcp/rcp.c (toremote, tolocal): Likewise.
 	* telnetd/sys_term.c (start_login): Likewise.
-	
+
 Mon Aug  5 00:23:07 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* configure.in: Check to see if the fd_set macros are defined by
@@ -1566,7 +1566,7 @@ Mon Aug  5 00:23:07 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* rsh/rsh.c: [HAVE_STDARG_H] <stdarg.h>: New include.
 	[!HAVE_STDARG_H] <varargs.h>: Conditionalize include.
-	
+
 	* libinetutils/hstrerror.c: New file.
 	* libinetutils/Makefile.in (SRCS): Add strerror.c & hstrerror.c.
 	* headers/acconfig.h (HAVE_H_ERRLIST_DECL): New define slot.
@@ -1722,7 +1722,7 @@ Mon Jul 22 00:14:09 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 	Check for sig_t.
 	(AC_CHECK_FUNCS): Temporarily add $LIBUTIL to $LIBS while doing this.
 	* headers/acconfig.h (HAVE_SYS_ERRLIST_DECL, HAVE_SIG_T,
-	HAVE___PROGNAME, HAVE_SNPRINTF): New entries. 
+	HAVE___PROGNAME, HAVE_SNPRINTF): New entries.
 	[!HAVE_SIG_T] (sig_t): New macro.
 	* libinetutils/err.c: New file.
 	* libinetutils/__progname.c: New file.
@@ -1772,7 +1772,7 @@ Sun Jul 21 12:19:48 1996  Miles Bader  <miles@gnu.ai.mit.edu>
  	libinetutils/localhost.c, inetd/inetd.c, ftpd/ftpd.c, ftpd/ftpcmd.y,
  	ftp/main.c, ftp/ftp.c, ftp/domacro.c, ftp/cmdtab.c, ftp/cmds.c
  	[HAVE_CONFIG_H] <config.h>: New include.
-	
+
 	* rules.make (install, uninstall, mostlyclean, distclean,
 	maintainer-clean, dist): Make :: rules.
 	(clean): New rule.
@@ -1883,7 +1883,7 @@ Thu Jul 11 00:39:45 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 	* telnet/main.c (help): Remove extra newlines.  Fiddle text.
 
 Wed Jul 10 03:41:39 1996  Miles Bader  <miles@gnu.ai.mit.edu>
-	
+
 	* ftp/main.c (ohelp, try_help, usage): New functions.
 	(long_options): New variable.
 	(main): Use getopt_long, and new help functions.
@@ -1904,7 +1904,7 @@ Wed Jul 10 03:41:39 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 	* ftpd/logwtmp.c (logwtmp): If HAVE_SETUTENT_R, use a more sysvish
 	style of wtmp frobbing.
 	* configure.in (AC_CHECK_FUNCS): Add setutent_r & logwtmp.
-	
+
 	* Makefile.in (distclean, clean): Split out targets, and clean up here.
 	Use $(SUBDIRS).
 
@@ -1957,7 +1957,7 @@ Wed Jul 10 03:41:39 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 	(main): Use help sometimes instead of usage.  Use getopt_long.
 	Add --help and --version options.
 	<getopt.h>, "version.h": New includes.
-	
+
 	* libinetutils: New directory, mostly from old comon dir.
 	* common: Dir removed.
 	* config.make.in (CPPFLAGS): Add -I../include.
diff --git a/Makefile.am b/Makefile.am
index 7d2d1b8..5c9f40c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc. 
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA. 
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 AUTOMAKE_OPTIONS = 1.9
 
@@ -24,7 +25,7 @@ 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 gwhois talk \
+	tftpd talkd telnet ftp rsh rcp rlogin tftp logger whois talk \
 	libicmp ping doc ifconfig traceroute rexec tests
 
 DISTCLEANFILES = pathdefs.make paths.defs
diff --git a/NEWS b/NEWS
index 30beda0..a24bd03 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,6 @@
-GNU inetutils NEWS -- history of user-visible changes. 2009-10-06
-
-Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009 
-	  Free Software Foundation, Inc.
+GNU inetutils NEWS -- history of user-visible changes. 2009-10-29
+Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006, 2007, 2008, 2009 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 d0e56aa..fb58b65 100644
--- a/README-alpha
+++ b/README-alpha
@@ -1,7 +1,10 @@
 This is the GNU Inetutils package.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+2008, 2009 Free Software Foundation, Inc.
+See end of file for copying conditions.
 
 This document describes the actions needed to build the pre-release or
-Git version of the package.  See end of file for copying conditions.
+Git version of the package.
 
 * Introduction
 
@@ -94,20 +97,17 @@ available from <http://autobuild.josefsson.org/inetutils/>
 Statistics based on Git commit logs are available from
 <http://gitstats.josefsson.org/inetutils/>.
 
-* Copyright information:
+* Copyright information
 
-Copyright (C) 2008, 2009 Free Software Foundation, Inc.
-
-   Permission is granted to anyone to make or distribute verbatim copies
-   of this document as received, in any medium, provided that the
-   copyright notice and this permission notice are preserved,
-   thus giving the recipient permission to redistribute in turn.
-
-   Permission is granted to distribute modified versions
-   of this document, or of portions of it,
-   under the above conditions, provided also that they
-   carry prominent notices stating who last changed them.
+Permission is granted to anyone to make or distribute verbatim copies
+of this document as received, in any medium, provided that the
+copyright notice and this permission notice are preserved,
+thus giving the recipient permission to redistribute in turn.
 
+Permission is granted to distribute modified versions
+of this document, or of portions of it,
+under the above conditions, provided also that they
+carry prominent notices stating who last changed them.
 
 Local Variables:
 mode: outline
diff --git a/TODO b/TODO
index 9e96ed9..2e13231 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,10 @@
+* General
+
+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.
+
 Add autoconf check for bison.
 
 Go through code and check what is clean, needs cleaning, etc.
@@ -77,3 +84,54 @@ translations, especially for the clients.
 2.0 will be a release that tries to put as much as possible into
 libraries (startup code, etc).  We would also like to try and write
 (or convince someone else to write) a gopher and gopherd pair.
+
+* libicmp
+
+Handle timestamp, router discovery and address packets.
+
+
+* ping/ping6
+
+Ability to send router discovery, address and maybe timestamp packets.
+
+Ability to ping multiple host in one go.
+
+* ifconfig
+
+** Implement flags support in changeif.c and options.c
+** Fix and move if_index.c to libinetutils.
+** Port to BSD.
+** Make sure it is a drop in replacement at least for the most
+   common options on Linux and BSD.
+
+** Some systems can provide more interfaces than
+  SIOCGIFCONF/if_nameindex, interfaces which are usually not UP but
+  registered nevertheless.
+  (linux: /prov/net/dev). Some support for that?
+
+** Honour IFF_CANTCHANGE when working in flag setting in brdaddr,
+  dstaddr, etc.
+
+** We could put the option parsing (invocation of getopt_long) into a
+  function like parse_opt_rest, which could be used by
+  system_parse_opt_rest to continue parsing the options as usual after
+  processing a non-option.
+
+** Is it necessary to merge long/short options intelligently?
+  For example, if a system specific option shadows a normal option?
+  Allow this?
+
+* whois
+
+What about rwhois?
+
+Should support the refer attribute of RIPE-189 objects.
+
+I need a procedure for looking up an IPv6 address in a list of prefixes.
+Will anybody contribute it?
+
+Add Exodus rwhois server (e.g. 216.35.0.0/16).
+
+Local Variables:
+mode: outline
+End:
diff --git a/am/check_macro.m4 b/am/check_macro.m4
index f1670e9..912d419 100644
--- a/am/check_macro.m4
+++ b/am/check_macro.m4
@@ -1,28 +1,30 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <miles@gnu.ai.mit.edu>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_CHECK_MACRO -- Check for cpp defines
 dnl   $1 - NAME   -- printed in message
 dnl   $2 - INCLS  -- C program text to inculde necessary files for testing
 dnl   $3 - MACROS -- a space-separated list of macros that all must be defined
 dnl		     defaults to NAME
-dnl   $4 - TRUE	  -- what to do if all macros are defined; defaults to 
+dnl   $4 - TRUE	  -- what to do if all macros are defined; defaults to
 dnl		     AC_DEFINE(upcase(HAVE_$1))
 dnl   $5 - FALSE  -- what to do if some macros aren't defined
 dnl
@@ -46,4 +48,3 @@ changequote([,])dnl
       IU_CVAR[=no])) dnl
   IU_RESULT_ACTIONS(IU_CVAR, [$1], [$4], [$5]) dnl
   undefine([IU_CVAR]) undefine([IU_TAG])])dnl
-
diff --git a/am/check_member.m4 b/am/check_member.m4
index 2b39b4b..8914988 100644
--- a/am/check_member.m4
+++ b/am/check_member.m4
@@ -1,21 +1,23 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <miles@gnu.ai.mit.edu>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_CHECK_MEMBER(AGGREGATE.MEMBER,
 dnl                [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
diff --git a/am/check_weak_refs.m4 b/am/check_weak_refs.m4
index 141ac8c..dd1f73f 100644
--- a/am/check_weak_refs.m4
+++ b/am/check_weak_refs.m4
@@ -1,21 +1,23 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <miles@gnu.ai.mit.edu>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_CHECK_WEAK_REFS -- See if any of a variety of `weak reference'
 dnl mechanisms works.  If so, this defines HAVE_WEAK_REFS, and one of
diff --git a/am/config_paths.m4 b/am/config_paths.m4
index 95757eb..07fdca4 100644
--- a/am/config_paths.m4
+++ b/am/config_paths.m4
@@ -1,21 +1,23 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <miles@gnu.ai.mit.edu>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_CONFIG_PATHS -- Configure system paths for use by programs
 dnl   $1 - PATHS    -- The file to read containing the paths
@@ -131,7 +133,7 @@ HAVE_$iu_sym
 	  x|d|f|c|b) iu_test_type=$iu_try;;
 
 	  *)
-	    # Just try the given name, with make-var substitution.  Besides 
+	    # Just try the given name, with make-var substitution.  Besides
 	    # yielding a value if found, this also sets the default.
 
 	    case "$iu_try" in "\""*"\"")
@@ -199,7 +201,7 @@ HAVE_$iu_sym
     fi
   done <[$1] >$iu_cache_file
 
-  # Read the cache values constructed by the previous loop, 
+  # Read the cache values constructed by the previous loop,
   . $iu_cache_file
 
   # Construct the pathdefs file -- a file of make variable definitions, of
diff --git a/am/enable.m4 b/am/enable.m4
index 051b071..a24ec5f 100644
--- a/am/enable.m4
+++ b/am/enable.m4
@@ -1,26 +1,28 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Written Joel N. Weber II <devnull@gnu.org>.
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written Joel N. Weber II.
 
 AC_DEFUN([IU_ENABLE_FOO],
  [AC_ARG_ENABLE($1, AS_HELP_STRING([--disable-$1], [don't compile $1]), ,
                 [enable_]$1[=$enable_]$2)
-[if test "$enable_$1" = yes; then 
+[if test "$enable_$1" = yes; then
    $1_BUILD=$1
    $1_INSTALL_HOOK="install-$1-hook"
 else
diff --git a/am/flushleft.m4 b/am/flushleft.m4
index 34ebd87..03f058d 100644
--- a/am/flushleft.m4
+++ b/am/flushleft.m4
@@ -1,21 +1,23 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <miles@gnu.ai.mit.edu>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_FLUSHLEFT -- remove all whitespace at the beginning of lines
 dnl This is useful for c-code which may include cpp statements
diff --git a/am/krb5.m4 b/am/krb5.m4
index ae70466..d436d7b 100644
--- a/am/krb5.m4
+++ b/am/krb5.m4
@@ -1,21 +1,23 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <miles@gnu.ai.mit.edu>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_CHECK_KRB5(VERSION,PREFIX)
 dnl Search for a Kerberos implementation in the standard locations plus PREFIX,
diff --git a/am/libcurses.m4 b/am/libcurses.m4
index 0ecb765..0c2cba4 100644
--- a/am/libcurses.m4
+++ b/am/libcurses.m4
@@ -1,21 +1,23 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <miles@gnu.ai.mit.edu>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_LIB_NCURSES -- check for, and configure, ncurses
 dnl
@@ -79,7 +81,7 @@ dnl Checks for various common libraries implementing the termcap interface,
 dnl including ncurses (unless --disable ncurses is specified), curses (which
 dnl does on some systems), termcap, and termlib.  If termcap is found, then
 dnl LIBTERMCAP is defined with the appropriate linker specification.
-dnl 
+dnl
 AC_DEFUN([IU_LIB_TERMCAP], [
   AC_REQUIRE([IU_LIB_NCURSES])
   if test "$LIBNCURSES"; then
diff --git a/am/result.m4 b/am/result.m4
index 32ca19d..b63174f 100644
--- a/am/result.m4
+++ b/am/result.m4
@@ -1,21 +1,23 @@
-dnl Copyright (C) 1996, 1997, 1998, 2002, 2004, 2005, 2007,
-dnl 2009 Free Software Foundation, Inc.
 dnl
-dnl Mostly written by Miles Bader <miles@gnu.ai.mit.edu>
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+dnl 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl
-dnl This program is free software; you can redistribute it and/or modify
+dnl This file is part of GNU Inetutils.
+dnl
+dnl GNU Inetutils is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
+dnl the Free Software Foundation, either version 3 of the License, or (at
+dnl your option) any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl GNU Inetutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
+dnl along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+dnl Written by Miles Bader.
 
 dnl IU_RESULT_ACTIONS -- generate shell code for the result of a test
 dnl   $1 -- CVAR  -- cache variable to check
diff --git a/bootstrap.conf b/bootstrap.conf
index b73d3a2..e219ac1 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,21 +1,20 @@
-# Bootstrap configuration.
-
-# Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
+# bootstrap.conf - Bootstrap configuration.
+# Copyright (C) 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, or (at your option)
-# any later version.
-
-# This program 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.
-
+# 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 # gnulib library name
 gnulib_name=libgnu
@@ -36,7 +35,7 @@ fdl-1.3
 filemode
 getcwd
 getline
-getopt
+getopt-gnu
 getpass
 gettext
 gettext-h
diff --git a/configure.ac b/configure.ac
index 0b8ebb5..57b254a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,24 +1,21 @@
-# Configuration for inetutils
+# 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.
 #
-# Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2005, 2006, 
-# 2007, 2008, 2009 Free Software Foundation, Inc.
+# This file is part of GNU Inetutils.
 #
-# Written by Miles Bader <miles@gnu.ai.mit.edu>
-#
-# This program is free software; you can redistribute it and/or modify
+# 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, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# This program 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.
+# 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, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 AC_PREREQ(2.59)
 
@@ -836,7 +833,7 @@ telnetd/Makefile
 tftp/Makefile
 tftpd/Makefile
 uucpd/Makefile
-gwhois/Makefile
+whois/Makefile
 lib/Makefile
 libls/Makefile
 ifconfig/Makefile
diff --git a/doc/.gitignore b/doc/.gitignore
index a5ee19f..24c6478 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,6 +1,6 @@
-inetutils.info*
 Makefile
 Makefile.in
 fdl-1.3.texi
+inetutils.info*
 stamp-vti
 version.texi
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1fd20d8..2c8d44e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 info_TEXINFOS = inetutils.texi
 
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index aba0c28..570c866 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -56,8 +56,8 @@
 This manual documents version @value{VERSION} of the @sc{gnu}
 networking utilities.
 
-Copyright @copyright{} 1994, 1995, 1996, 2000, 2001, 2007, 2008, 2009
-Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+2008, 2009 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 3dd7453..87057c8 100644
--- a/ftp/Makefile.am
+++ b/ftp/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @ftp_BUILD@
 
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 6e31667..172fa5d 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1985, 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * FTP User Program -- Command Routines.
  */
diff --git a/ftp/cmdtab.c b/ftp/cmdtab.c
index 1364bfc..4ca7427 100644
--- a/ftp/cmdtab.c
+++ b/ftp/cmdtab.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1985, 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/ftp/domacro.c b/ftp/domacro.c
index 226cfcb..61e2a65 100644
--- a/ftp/domacro.c
+++ b/ftp/domacro.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1985, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/ftp/extern.h b/ftp/extern.h
index abb880d..50f8521 100644
--- a/ftp/extern.h
+++ b/ftp/extern.h
@@ -1,6 +1,25 @@
-/*-
- * Copyright (c) 1994 The Regents of the University of California.
- * All rights reserved.
+/*
+  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/'. */
+
+/*
+ * Copyright (c) 1994
+ *	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
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -25,8 +44,6 @@
  * 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.
- *
- *	@(#)extern.h	8.3 (Berkeley) 10/9/94
  */
 
 struct timeval;
diff --git a/ftp/ftp.c b/ftp/ftp.c
index c66b2a5..2decbf7 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1985, 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/ftp/ftp_var.h b/ftp/ftp_var.h
index b1588df..3e10f22 100644
--- a/ftp/ftp_var.h
+++ b/ftp/ftp_var.h
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1985, 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -25,30 +44,8 @@
  * 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.
- *
- *	@(#)ftp_var.h	8.4 (Berkeley) 10/9/94
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * FTP global variables.
  */
diff --git a/ftp/main.c b/ftp/main.c
index d3dfb0d..67c7bf0 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1985, 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * FTP User Program -- Command Interface.
  */
diff --git a/ftp/ruserpass.c b/ftp/ruserpass.c
index 147c66c..3eb3dc1 100644
--- a/ftp/ruserpass.c
+++ b/ftp/ruserpass.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1985, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,27 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/ftpd/Makefile.am b/ftpd/Makefile.am
index ecf894a..6d5d656 100644
--- a/ftpd/Makefile.am
+++ b/ftpd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/ftpd/README.sec b/ftpd/README.sec
deleted file mode 100644
index 0c42279..0000000
--- a/ftpd/README.sec
+++ /dev/null
@@ -1,32 +0,0 @@
-_________________________________________________________________
-CERT* Advisory CA-97.27: FTP Bounce
-
-Original issue date: Dec. 10, 1997
-Last revised: July 9, 1998 
-	Updated information for Digital Equipment Corporation
-
-Description:
-	The core component of the problem is that by using the PORT command in
-	active FTP mode, an attacker may be able to establish connections to
-	arbitrary ports on machines other than the originating client. This
-	behavior is RFC compliant, but it is also potentially a source of
-	security problems for some sites. The example attacks described in the
-	tech tip demonstrate the potential of this vulnerability.
-
-inetutils: corrected in version 1.4
-_________________________________________________________________
-CERT* Advisory CA-97.16 : ftpd Signal Handling Vulnerability
-Original issue date: May 29, 1997
-Last Revised: December 5, 1997
-	Added vendor information for NCR Corporation to the Updates section.
-
-Description:
-	This vulnerability is caused by a signal handling routine increasing
-	process privileges to root, while still continuing to catch other
-	signals. This introduces a race condition which may allow regular, as
-	well as anonymous ftp, users to access files with root privileges.
-	Depending on the configuration of the ftpd server, this may allow
-	intruders to read or write to arbitrary files on the server.
-
-inetutils: not affected from release after 1.2.x
-_________________________________________________________________
diff --git a/ftpd/auth.c b/ftpd/auth.c
index 15ee350..cddcdfb 100644
--- a/ftpd/auth.c
+++ b/ftpd/auth.c
@@ -1,3 +1,22 @@
+/*
+  Copyright (C) 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/'. */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/ftpd/conf.c b/ftpd/conf.c
index 290c1ae..1dcb6b1 100644
--- a/ftpd/conf.c
+++ b/ftpd/conf.c
@@ -1,3 +1,22 @@
+/*
+  Copyright (C) 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/'. */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/ftpd/extern.h b/ftpd/extern.h
index ce1ac8c..c7fab20 100644
--- a/ftpd/extern.h
+++ b/ftpd/extern.h
@@ -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) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -25,30 +45,8 @@
  * 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.
- *
- *	@(#)extern.h	8.2 (Berkeley) 4/4/94
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #include <stdio.h>
 #include <setjmp.h>
 #include <getopt.h>
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index fe4471b..da2123e 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -10,7 +10,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -25,8 +25,6 @@
  * 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.
- *
- *	@(#)ftpcmd.y	8.3 (Berkeley) 4/6/94
  */
 
 /*
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 8a951cf..38e23c4 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -1,3 +1,23 @@
+/*
+  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/'. */
+
 /* - Ftp Server
  * Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -10,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +47,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * FTP server.
  */
diff --git a/ftpd/logwtmp.c b/ftpd/logwtmp.c
index e001686..99e23f6 100644
--- a/ftpd/logwtmp.c
+++ b/ftpd/logwtmp.c
@@ -1,30 +1,26 @@
 /*
- SYSVish version:
+  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-Copyright (C) 1996, 2000, 2007 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+  This file is part of GNU Inetutils.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library 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 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.
 
-The GNU C Library 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
-Library General Public License for more details.
+  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 Library General
-PublicLicense along with the GNU C Library; see the file COPYING.LIB.
-Ifnot, write to the Free Software Foundation, Inc., 51 Franklin
-Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
- * BSDish version:
- *  
+/*
  * Copyright (c) 1988, 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:
@@ -33,14 +29,10 @@ Street, Fifth Floor, Boston, MA 02110-1301 USA.
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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
@@ -52,7 +44,6 @@ Street, Fifth Floor, Boston, MA 02110-1301 USA.
  * 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.
- *  
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/ftpd/pam.c b/ftpd/pam.c
index a452408..df80df0 100644
--- a/ftpd/pam.c
+++ b/ftpd/pam.c
@@ -1,3 +1,22 @@
+/*
+  Copyright (C) 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/'. */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/ftpd/popen.c b/ftpd/popen.c
index f59ebe1..2f47954 100644
--- a/ftpd/popen.c
+++ b/ftpd/popen.c
@@ -1,10 +1,27 @@
 /*
+  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) 1988, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
- * This code is derived from software written by Ken Arnold and
- * published in UNIX Review, Vol. 6, No. 8.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -28,28 +45,10 @@
  * 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.
- *
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+/* This code is derived from software written by Ken Arnold and
+   published in UNIX Review, Vol. 6, No. 8.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ftpd/server_mode.c b/ftpd/server_mode.c
index bc122dc..da46f40 100644
--- a/ftpd/server_mode.c
+++ b/ftpd/server_mode.c
@@ -1,3 +1,22 @@
+/*
+  Copyright (C) 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/'. */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/gwhois/README b/gwhois/README
deleted file mode 100644
index 0a31350..0000000
--- a/gwhois/README
+++ /dev/null
@@ -1,31 +0,0 @@
-Why another whois client? Because the RIPE client is a mess of hacks and
-#ifdefs and more complex programs lack features or are bloated.
-
-Notes about the data files:
-- domain names MUST be lowercase and MUST begin with "." or "-".
-- first match wins (for both domains and netblocks)
-- elements in tld_serv_list are matched against the end of the query
-
-Please send me any information you have regarding domains and netblocks
-not correctly handled by the program.
-
-Please also try to compile after defining HAVE_GETADDRINFO and send me
-working #defines for your flavour of UNIX.
-
-The home of the program is http://www.linux.it/~md/software/
-
-
-Other information sources:
-- RIPE-187 and RIPE-189 (from ftp://ftp.ripe.net/ripe/docs/ or
-  http://www.ripe.net/docs/)
-- Greg Woods' awhois script (from ftp.weird.com)
-- the www.geektools.org CGI proxy
-- home of the 6bone client: http://www.ip.qwest.net/~david/software/
-- http://www.apnic.net/db/RIRs.html and
-  http://www.apnic.net/maps/tld-list.html
-- http://www.uninett.no/navn/domreg.html
-- http://www.iahc.org/dns-refs/registry.html
-
-Marco d'Itri
-<md@linux.it>
-
diff --git a/gwhois/TODO b/gwhois/TODO
deleted file mode 100644
index 2b9a5f0..0000000
--- a/gwhois/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-What about rwhois?
-
-Should support the refer attribute of RIPE-189 objects.
-
-I need a procedure for looking up an IPv6 address in a list of prefixes.
-Will anybody contribute it?
-
-Add Exodus rwhois server (e.g. 216.35.0.0/16).
-
diff --git a/headers/Makefile.am b/headers/Makefile.am
index 43304ed..1f8435d 100644
--- a/headers/Makefile.am
+++ b/headers/Makefile.am
@@ -1,19 +1,20 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 noinst_HEADERS = tftpsubs.h shishi_def.h
diff --git a/headers/shishi_def.h b/headers/shishi_def.h
index a1c906c..60f8599 100644
--- a/headers/shishi_def.h
+++ b/headers/shishi_def.h
@@ -1,19 +1,21 @@
-/* Copyright (C) 1991, 1992, 1993, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 3 of the
-License, or (at your option) any later version.
+  This file is part of GNU Inetutils.
 
-This library 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
-Library General Public License for more details.
+  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.
 
-You should have received a copy of the GNU Library General Public
-License along with this library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+  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/'. */
 
 #ifdef SHISHI
 # include <sys/socket.h>
diff --git a/headers/tftpsubs.h b/headers/tftpsubs.h
index 84ac7bf..6c3c270 100644
--- a/headers/tftpsubs.h
+++ b/headers/tftpsubs.h
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 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) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -25,8 +44,6 @@
  * 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.
- *
- *	@(#)tftpsubs.h	8.1 (Berkeley) 6/6/93
  */
 
 /*
diff --git a/hostname/Makefile.am b/hostname/Makefile.am
index 66e6c8a..c7d78f8 100644
--- a/hostname/Makefile.am
+++ b/hostname/Makefile.am
@@ -1,20 +1,20 @@
-# Copyright (C) 2008 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @hostname_BUILD@
 
diff --git a/hostname/hostname.c b/hostname/hostname.c
index 7925862..5b1c0a0 100644
--- a/hostname/hostname.c
+++ b/hostname/hostname.c
@@ -1,21 +1,20 @@
-/* Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+/*
+   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <config.h>
 
@@ -61,8 +60,8 @@ static struct argp_option argp_options[] = {
 #define GRP 0
   {"aliases", 'a', NULL, 0, "alias names", GRP+1},
   {"domain", 'd', NULL, 0, "DNS domain name", GRP+1},
-  {"file", 'F', "FILE", 0, "read host name or NIS domain name "
-   "from FILE", GRP+1},
+  {"file", 'F', "FILE", 0, "set host name or NIS domain name from FILE",
+   GRP+1},
   {"fqdn", 'f', NULL, 0, "DNS host name or FQDN", GRP+1},
   {"long", 'f', NULL, OPTION_ALIAS, "DNS host name or FQDN", GRP+1},
   {"ip-addresses", 'i', NULL, 0, "addresses for the host name", GRP+1},
@@ -147,7 +146,7 @@ main (int argc, char *argv[])
   hostname_options options;
 
   set_program_name (argv[0]);
-  
+
   memset ((void *) &options, 0, sizeof (options));
 
   /* Parse command line */
diff --git a/ifconfig/Makefile.am b/ifconfig/Makefile.am
index 34158f4..b4501d5 100644
--- a/ifconfig/Makefile.am
+++ b/ifconfig/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 SUBDIRS=system
 
diff --git a/ifconfig/TODO b/ifconfig/TODO
deleted file mode 100644
index caa2944..0000000
--- a/ifconfig/TODO
+++ /dev/null
@@ -1,26 +0,0 @@
--*- Mode: Outline -*-
-
-* Before release:
-
-** Implement flags support in changeif.c and options.c
-** Fix and move if_index.c to libinetutils.
-** Port to BSD.
-** Make sure it is a drop in replacement at least for the most
-   common options on Linux and BSD.
-
-* Some systems can provide more interfaces than
-  SIOCGIFCONF/if_nameindex, interfaces which are usually not UP but
-  registered nevertheless.
-  (linux: /prov/net/dev). Some support for that?
-
-* Honour IFF_CANTCHANGE when working in flag setting in brdaddr,
-  dstaddr, etc.
-
-* We could put the option parsing (invocation of getopt_long) into a
-  function like parse_opt_rest, which could be used by
-  system_parse_opt_rest to continue parsing the options as usual after
-  processing a non-option.
-
-* Is it necessary to merge long/short options intelligently?
-  For example, if a system specific option shadows a normal option?
-  Allow this?
diff --git a/ifconfig/changeif.c b/ifconfig/changeif.c
index c9d9fe5..811735f 100644
--- a/ifconfig/changeif.c
+++ b/ifconfig/changeif.c
@@ -1,24 +1,23 @@
 /* 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, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/flags.c b/ifconfig/flags.c
index 23aaca4..cc133a2 100644
--- a/ifconfig/flags.c
+++ b/ifconfig/flags.c
@@ -1,24 +1,23 @@
 /* flags.c -- network interface flag handling
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/flags.h b/ifconfig/flags.h
index 4087dfa..ab2a9ab 100644
--- a/ifconfig/flags.h
+++ b/ifconfig/flags.h
@@ -1,24 +1,23 @@
-/* flags.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_FLAGS_H
 # define IFCONFIG_FLAGS_H
diff --git a/ifconfig/if_index.c b/ifconfig/if_index.c
index 77f8245..ac02e4b 100644
--- a/ifconfig/if_index.c
+++ b/ifconfig/if_index.c
@@ -1,20 +1,21 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2001, 2007,
-   2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  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 the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  This file is part of GNU Inetutils.
 
-   This program 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.
+  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.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+  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/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/if_index.h b/ifconfig/if_index.h
index a2c5f47..ec97ad7 100644
--- a/ifconfig/if_index.h
+++ b/ifconfig/if_index.h
@@ -1,21 +1,21 @@
-/* if_index.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   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 the Free Software Foundation; either version 3
-   of the License, or (at your option) any later version.
+  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.
 
-   This program 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.
+  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, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifndef IF_INDEX_H
 # define IF_INDEX_H
diff --git a/ifconfig/ifconfig.c b/ifconfig/ifconfig.c
index 302db75..b55bb06 100644
--- a/ifconfig/ifconfig.c
+++ b/ifconfig/ifconfig.c
@@ -1,23 +1,23 @@
 /* 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, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/ifconfig.h b/ifconfig/ifconfig.h
index 5a62ad2..c4e1238 100644
--- a/ifconfig/ifconfig.h
+++ b/ifconfig/ifconfig.h
@@ -1,23 +1,23 @@
-/* ifconfig.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007, 2008, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_IFCONFIG_H
 # define IFCONFIG_IFCONFIG_H
diff --git a/ifconfig/options.c b/ifconfig/options.c
index c379ab3..05a2d41 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -1,23 +1,23 @@
 /* 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, 2007, 2008, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/options.h b/ifconfig/options.h
index 23ea79c..d97afce 100644
--- a/ifconfig/options.h
+++ b/ifconfig/options.h
@@ -1,23 +1,23 @@
-/* options.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007, 2008, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_OPTIONS_H
 # define IFCONFIG_OPTIONS_H
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index 294233c..3c175bf 100644
--- a/ifconfig/printif.c
+++ b/ifconfig/printif.c
@@ -1,23 +1,23 @@
 /* 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, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/printif.h b/ifconfig/printif.h
index 14cd15d..a82ee64 100644
--- a/ifconfig/printif.h
+++ b/ifconfig/printif.h
@@ -1,23 +1,23 @@
-/* printif.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_PRINTIF_H
 # define IFCONFIG_PRINTIF_H
diff --git a/ifconfig/system.c b/ifconfig/system.c
index df6e22f..2e07fec 100644
--- a/ifconfig/system.c
+++ b/ifconfig/system.c
@@ -1,3 +1,22 @@
+/*
+  Copyright (C) 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/'. */
+
 #if defined(__linux__)
 # include "system/linux.c"
 #elif defined(__sun__)
diff --git a/ifconfig/system.h b/ifconfig/system.h
index de3f697..f84c08e 100644
--- a/ifconfig/system.h
+++ b/ifconfig/system.h
@@ -1,23 +1,23 @@
-/* system.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA. */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_SYSTEM_H
 # define IFCONFIG_SYSTEM_H
diff --git a/ifconfig/system/Makefile.am b/ifconfig/system/Makefile.am
index 8bb4b1b..2b72283 100644
--- a/ifconfig/system/Makefile.am
+++ b/ifconfig/system/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 # *.c probably shouldn't be in here as 'headers'
 # but I'm too tired to figure out the right way right now. -jb
diff --git a/ifconfig/system/generic.c b/ifconfig/system/generic.c
index a6cf361..ce7dd17 100644
--- a/ifconfig/system/generic.c
+++ b/ifconfig/system/generic.c
@@ -1,24 +1,23 @@
 /* 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, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/system/generic.h b/ifconfig/system/generic.h
index 9e3e679..300be93 100644
--- a/ifconfig/system/generic.h
+++ b/ifconfig/system/generic.h
@@ -1,25 +1,23 @@
-/* generic.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
-
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_SYSTEM_GENERIC_H
 # define IFCONFIG_SYSTEM_GENERIC_H
diff --git a/ifconfig/system/hpux.c b/ifconfig/system/hpux.c
index 0a0a856..8448806 100644
--- a/ifconfig/system/hpux.c
+++ b/ifconfig/system/hpux.c
@@ -1,24 +1,23 @@
 /* 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, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/system/hpux.h b/ifconfig/system/hpux.h
index 519e8ca..6395a41 100644
--- a/ifconfig/system/hpux.h
+++ b/ifconfig/system/hpux.h
@@ -1,24 +1,23 @@
-/* hpux.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_SYSTEM_HPUX_H
 # define IFCONFIG_SYSTEM_HPUX_H
diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
index 1c48db4..188059f 100644
--- a/ifconfig/system/linux.c
+++ b/ifconfig/system/linux.c
@@ -1,24 +1,23 @@
 /* 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, 2005, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/system/linux.h b/ifconfig/system/linux.h
index fc808e4..7cca9ca 100644
--- a/ifconfig/system/linux.h
+++ b/ifconfig/system/linux.h
@@ -1,24 +1,23 @@
-/* linux.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_SYSTEM_LINUX_H
 # define IFCONFIG_SYSTEM_LINUX_H
diff --git a/ifconfig/system/osf.c b/ifconfig/system/osf.c
index 55a18cf..9b1fd11 100644
--- a/ifconfig/system/osf.c
+++ b/ifconfig/system/osf.c
@@ -1,24 +1,23 @@
-/* system/osf.c -- OSF specific code for ifconfig
+/* 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, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/system/osf.h b/ifconfig/system/osf.h
index 1f522ef..3be7009 100644
--- a/ifconfig/system/osf.h
+++ b/ifconfig/system/osf.h
@@ -1,24 +1,23 @@
-/* osf.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_SYSTEM_HPUX_H
 # define IFCONFIG_SYSTEM_HPUX_H
diff --git a/ifconfig/system/qnx.c b/ifconfig/system/qnx.c
index 3ebc012..3e73c1c 100644
--- a/ifconfig/system/qnx.c
+++ b/ifconfig/system/qnx.c
@@ -1,24 +1,23 @@
-/* generic.c -- generic system code for ifconfig
+/* 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, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/system/qnx.h b/ifconfig/system/qnx.h
index 6aeefd8..92ecc6a 100644
--- a/ifconfig/system/qnx.h
+++ b/ifconfig/system/qnx.h
@@ -1,24 +1,23 @@
-/* solaris.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_SYSTEM_SOLARIS_H
 # define IFCONFIG_SYSTEM_SOLARIS_H
diff --git a/ifconfig/system/solaris.c b/ifconfig/system/solaris.c
index d725139..33699b5 100644
--- a/ifconfig/system/solaris.c
+++ b/ifconfig/system/solaris.c
@@ -1,24 +1,23 @@
 /* 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, 2007, 2009 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ifconfig/system/solaris.h b/ifconfig/system/solaris.h
index ae13ee0..1611922 100644
--- a/ifconfig/system/solaris.h
+++ b/ifconfig/system/solaris.h
@@ -1,24 +1,23 @@
-/* solaris.h
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Marcus Brinkmann.
+  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.
 
-   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 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA.
- */
+/* Written by Marcus Brinkmann.  */
 
 #ifndef IFCONFIG_SYSTEM_SOLARIS_H
 # define IFCONFIG_SYSTEM_SOLARIS_H
diff --git a/inetd/Makefile.am b/inetd/Makefile.am
index d989d64..c8ed234 100644
--- a/inetd/Makefile.am
+++ b/inetd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/inetd/inetd.c b/inetd/inetd.c
index d59b60e..f4637c9 100644
--- a/inetd/inetd.c
+++ b/inetd/inetd.c
@@ -1,27 +1,27 @@
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
+/*
+  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.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  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, 1991, 1993, 1994
  *	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:
@@ -30,10 +30,10 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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
diff --git a/lib/.gitignore b/lib/.gitignore
index f9d57b1..d7efcc0 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -23,9 +23,9 @@ basename.c
 btowc.c
 canonicalize-lgpl.c
 canonicalize.h
+charset.alias
 chdir-long.c
 chdir-long.h
-charset.alias
 chown.c
 close-hook.c
 close-hook.h
@@ -56,6 +56,7 @@ fcntl-safer.h
 fcntl.h
 fcntl.in.h
 fd-safer.c
+fdopendir.c
 filemode.c
 filemode.h
 float+.h
@@ -66,6 +67,7 @@ fnmatch.h
 fnmatch.in.h
 fnmatch_loop.c
 fopen-safer.c
+fopen.c
 fseeko.c
 fstatat.c
 getcwd.c
@@ -111,6 +113,7 @@ memchr.valgrind
 mempcpy.c
 memrchr.c
 minmax.h
+mkdir.c
 mkdirat.c
 obstack.c
 obstack.h
@@ -151,6 +154,7 @@ regex.h
 regex_internal.c
 regex_internal.h
 regexec.c
+rmdir.c
 same-inode.h
 save-cwd.c
 save-cwd.h
@@ -161,6 +165,7 @@ sleep.c
 snprintf.c
 sockets.c
 sockets.h
+stat.c
 stdarg.h
 stdarg.in.h
 stdbool.h
@@ -204,12 +209,16 @@ sys_time.h
 sys_time.in.h
 sysexits.h
 sysexits.in.h
+time.h
+time.in.h
 uinttostr.c
 umaxtostr.c
 unistd--.h
 unistd-safer.h
 unistd.h
 unistd.in.h
+unlink.c
+unlinkat.c
 unlocked-io.h
 vasnprintf.c
 vasnprintf.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0948372..e2b0f22 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,20 +1,20 @@
-## Makefile for gnulib/lib				-*-Makefile-*-
-
-# Copyright (C) 1995-2007 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
-## the Free Software Foundation; either version 3, or (at your option)
-## any later version.
-
-## This program 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, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-## 02110-1301, USA.
+# Makefile for gnulib/lib				-*-Makefile-*-
+# Copyright (C) 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/'.
 
 include gnulib.mk
diff --git a/libicmp/Makefile.am b/libicmp/Makefile.am
index eff4566..0e38470 100644
--- a/libicmp/Makefile.am
+++ b/libicmp/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 noinst_LIBRARIES = libicmp.a
 
diff --git a/libicmp/TODO b/libicmp/TODO
deleted file mode 100644
index 67943db..0000000
--- a/libicmp/TODO
+++ /dev/null
@@ -1 +0,0 @@
-0	timestamp, router discovery and address packets
diff --git a/libicmp/icmp.h b/libicmp/icmp.h
index 52eb009..4951e7f 100644
--- a/libicmp/icmp.h
+++ b/libicmp/icmp.h
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 /*
  * Structure of an icmp header.
diff --git a/libicmp/icmp_address.c b/libicmp/icmp_address.c
index 12cf564..a4a7825 100644
--- a/libicmp/icmp_address.c
+++ b/libicmp/icmp_address.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998, 2001, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libicmp/icmp_cksum.c b/libicmp/icmp_cksum.c
index def0e23..f49e252 100644
--- a/libicmp/icmp_cksum.c
+++ b/libicmp/icmp_cksum.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998, 2001, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libicmp/icmp_echo.c b/libicmp/icmp_echo.c
index 4cf411c..749433f 100644
--- a/libicmp/icmp_echo.c
+++ b/libicmp/icmp_echo.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998, 2001, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libicmp/icmp_timestamp.c b/libicmp/icmp_timestamp.c
index 89022d1..dadbfb4 100644
--- a/libicmp/icmp_timestamp.c
+++ b/libicmp/icmp_timestamp.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998, 2001, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libinetutils/Makefile.am b/libinetutils/Makefile.am
index 75f0aa2..217609b 100644
--- a/libinetutils/Makefile.am
+++ b/libinetutils/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 noinst_LIBRARIES = libinetutils.a
 
diff --git a/libinetutils/argcv.c b/libinetutils/argcv.c
index 20064df..e84acd1 100644
--- a/libinetutils/argcv.c
+++ b/libinetutils/argcv.c
@@ -1,19 +1,21 @@
 /* argcv.c - simple functions for parsing input based on whitespace
-   Copyright (C) 1999, 2000, 2001, 2007, 2008 Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  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
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  This file is part of GNU Inetutils.
 
-   This program 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.
+  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.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+  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/'. */
 
 #include "argcv.h"
 #include <ctype.h>
diff --git a/libinetutils/argcv.h b/libinetutils/argcv.h
index 866f63f..eb3635e 100644
--- a/libinetutils/argcv.h
+++ b/libinetutils/argcv.h
@@ -1,19 +1,21 @@
-/* GNU mailutils - a suite of utilities for electronic mail
-   Copyright (C) 1999, 2000, 2001, 2007 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
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program 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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+/*
+  Copyright (C) 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/'. */
 
 #ifndef _ARGCV_H
 # define _ARGCV_H 1
diff --git a/libinetutils/cleansess.c b/libinetutils/cleansess.c
index fcb11d2..4cd8b30 100644
--- a/libinetutils/cleansess.c
+++ b/libinetutils/cleansess.c
@@ -1,22 +1,23 @@
-/* Clean up the pty and frob utmp/wtmp accordingly after logout
+/* 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.
 
-   Copyright (C) 1996, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Miles Bader <miles@gnu.ai.mit.edu>
+  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.
 
-   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 the Free Software Foundation; either version 3, 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+/* Written by Miles Bader.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libinetutils/daemon.c b/libinetutils/daemon.c
index 14ed1dd..44fa337 100644
--- a/libinetutils/daemon.c
+++ b/libinetutils/daemon.c
@@ -1,4 +1,23 @@
-/*-
+/*
+  Copyright (C) 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) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libinetutils/defauthors.c b/libinetutils/defauthors.c
index fef8f00..5e4cb58 100644
--- a/libinetutils/defauthors.c
+++ b/libinetutils/defauthors.c
@@ -1,18 +1,20 @@
-/* This file is part of GNU Inetutils.
-   Copyright (C) 2009  Free Software Foundation, Inc.
+/*
+  Copyright (C) 2009 Free Software Foundation, Inc.
 
-   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, or (at your option)
-   any later version.
+  This file is part of GNU Inetutils.
 
-   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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Inetutils; If not, see <http://www.gnu.org/licenses/>. */
+  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/'. */
 
 #include <stdlib.h>
 
diff --git a/libinetutils/des_rw.c b/libinetutils/des_rw.c
index bc471a7..7b77f36 100644
--- a/libinetutils/des_rw.c
+++ b/libinetutils/des_rw.c
@@ -1,4 +1,23 @@
-/*-
+/*
+  Copyright (C) 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) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 2ab4254..0a10cba 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 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) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libinetutils/krcmd.c b/libinetutils/krcmd.c
index 6bb637c..17a1f25 100644
--- a/libinetutils/krcmd.c
+++ b/libinetutils/krcmd.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 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) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libinetutils/libinetutils.h b/libinetutils/libinetutils.h
index a4afb34..5fc3062 100644
--- a/libinetutils/libinetutils.h
+++ b/libinetutils/libinetutils.h
@@ -1,20 +1,20 @@
-/* This file is part of GNU inetutils
-   Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
-
-   This library 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.
-
-   This library 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 library; if not, write to the
-   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301 USA */
+/*
+  Copyright (C) 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/'. */
 
 #include "config.h"
 #include "argp-version-etc.h"
diff --git a/libinetutils/localhost.c b/libinetutils/localhost.c
index bf63102..54f198d 100644
--- a/libinetutils/localhost.c
+++ b/libinetutils/localhost.c
@@ -1,22 +1,23 @@
-/* A slightly more convenient wrapper for gethostname
+/* 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.
 
-   Copyright (C) 1996, 1997, 2000, 2005, 2006, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Miles Bader <miles@gnu.ai.mit.edu>
+  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.
 
-   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 the Free Software Foundation; either version 3, 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+/* Written by Miles Bader.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libinetutils/logwtmp.c b/libinetutils/logwtmp.c
index f41c7f7..0dad8cd 100644
--- a/libinetutils/logwtmp.c
+++ b/libinetutils/logwtmp.c
@@ -1,22 +1,23 @@
-/* A version of bsd `logwtmp' that should be widely portable
+/* 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.
 
-   Copyright (C) 1996, 2000, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Miles Bader <miles@gnu.ai.mit.edu>
+  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.
 
-   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 the Free Software Foundation; either version 3, 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+/* Written by Miles Bader.  */
 
 /* If `KEEP_OPEN' is defined, then a special version of logwtmp is compiled,
    called logwtmp_keep_open, which keeps the wtmp file descriptor open
diff --git a/libinetutils/logwtmpko.c b/libinetutils/logwtmpko.c
index 3e3c3c0..d194c5b 100644
--- a/libinetutils/logwtmpko.c
+++ b/libinetutils/logwtmpko.c
@@ -1,2 +1,21 @@
+/*
+  Copyright (C) 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/'. */
+
 #define KEEP_OPEN
 #include "logwtmp.c"
diff --git a/libinetutils/setsig.c b/libinetutils/setsig.c
index 9e8dbab..7c8a428 100644
--- a/libinetutils/setsig.c
+++ b/libinetutils/setsig.c
@@ -1,22 +1,23 @@
-/* Set a signal handler, trying to turning on the SA_RESTART bit
+/* 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.
 
-   Copyright (C) 1997, 2000, 2007 Free Software Foundation, Inc.
+  This file is part of GNU Inetutils.
 
-   Written by Miles Bader <miles@gnu.ai.mit.edu>
+  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.
 
-   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 the Free Software Foundation; either version 3, 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.
 
-   This program 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/'. */
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+/* Written by Miles Bader.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libinetutils/shishi.c b/libinetutils/shishi.c
index 312806b..9c6be8e 100644
--- a/libinetutils/shishi.c
+++ b/libinetutils/shishi.c
@@ -1,19 +1,21 @@
 /* shishi.c -- functions to use kerberos V with shishi
-   Copyright (C) 1990-1999, 2000, 2002, 2007, 2009 Free Software Foundation, Inc.
+  Copyright (C) 2005, 2006, 2007, 2008, 2009 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
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+  This file is part of GNU Inetutils.
 
-   This program 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.
+  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.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+  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/'. */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/libinetutils/tftpsubs.c b/libinetutils/tftpsubs.c
index 572e122..7d0245d 100644
--- a/libinetutils/tftpsubs.c
+++ b/libinetutils/tftpsubs.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 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) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libinetutils/ttymsg.c b/libinetutils/ttymsg.c
index 30d0df8..2dad30d 100644
--- a/libinetutils/ttymsg.c
+++ b/libinetutils/ttymsg.c
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 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) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libinetutils/utmp_init.c b/libinetutils/utmp_init.c
index 66c7c32..1ce2549 100644
--- a/libinetutils/utmp_init.c
+++ b/libinetutils/utmp_init.c
@@ -1,21 +1,44 @@
-/************************************************************************
-* Copyright 1995 by Wietse Venema.  All rights reserved. Individual files
-* may be covered by other copyrights (as noted in the file itself.)
-*
-* This material was originally written and compiled by Wietse Venema at
-* Eindhoven University of Technology, The Netherlands, in 1990, 1991,
-* 1992, 1993, 1994 and 1995.
-*
-* Redistribution and use in source and binary forms are permitted
-* provided that this entire copyright notice is duplicated in all such
-* copies.
-*
-* This software is provided "as is" and without any expressed or implied
-* warranties, including, without limitation, the implied warranties of
-* merchantibility and fitness for any particular purpose.
-************************************************************************/
-/* Author: Wietse Venema <wietse@wzv.win.tue.nl> */
-/* light changes where done to accomodate libinetutils: Alain Magloire */
+/*
+  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/'. */
+
+/*
+ * Copyright (c) 1995 Wietse Venema.  All rights reserved.
+ *
+ * Individual files may be covered by other copyrights (as noted in
+ * the file itself.)
+ *
+ * This material was originally written and compiled by Wietse Venema
+ * at Eindhoven University of Technology, The Netherlands, in 1990,
+ * 1991, 1992, 1993, 1994 and 1995.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this entire copyright notice is duplicated in all
+ * such copies.
+ *
+ * This software is provided "as is" and without any expressed or
+ * implied warranties, including, without limitation, the implied
+ * warranties of merchantibility and fitness for any particular
+ * purpose.
+ */
+
+/* Written by Wietse Venema.  With port to GNU Inetutils done by Alain
+   Magloire.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libinetutils/utmp_logout.c b/libinetutils/utmp_logout.c
index 9fe77ec..e055b0b 100644
--- a/libinetutils/utmp_logout.c
+++ b/libinetutils/utmp_logout.c
@@ -1,21 +1,44 @@
-/************************************************************************
-* Copyright 1995 by Wietse Venema.  All rights reserved. Individual files
-* may be covered by other copyrights (as noted in the file itself.)
-*
-* This material was originally written and compiled by Wietse Venema at
-* Eindhoven University of Technology, The Netherlands, in 1990, 1991,
-* 1992, 1993, 1994 and 1995.
-*
-* Redistribution and use in source and binary forms are permitted
-* provided that this entire copyright notice is duplicated in all such
-* copies.
-*
-* This software is provided "as is" and without any expressed or implied
-* warranties, including, without limitation, the implied warranties of
-* merchantibility and fitness for any particular purpose.
-************************************************************************/
-/* Author: Wietse Venema <wietse@wzv.win.tue.nl> */
-/* light changes for inetutils : Alain Magloire */
+/*
+  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/'. */
+
+/*
+ * Copyright (c) 1995 Wietse Venema.  All rights reserved.
+ *
+ * Individual files may be covered by other copyrights (as noted in
+ * the file itself.)
+ *
+ * This material was originally written and compiled by Wietse Venema
+ * at Eindhoven University of Technology, The Netherlands, in 1990,
+ * 1991, 1992, 1993, 1994 and 1995.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this entire copyright notice is duplicated in all
+ * such copies.
+ *
+ * This software is provided "as is" and without any expressed or
+ * implied warranties, including, without limitation, the implied
+ * warranties of merchantibility and fitness for any particular
+ * purpose.
+ */
+
+/* Written by Wietse Venema.  With port to GNU Inetutils done by Alain
+   Magloire.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libls/Makefile.am b/libls/Makefile.am
index 7d09c7d..bf62b14 100644
--- a/libls/Makefile.am
+++ b/libls/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 noinst_LIBRARIES = @libls_BUILD@
 
diff --git a/libls/cmp.c b/libls/cmp.c
index 7e92947..b674182 100644
--- a/libls/cmp.c
+++ b/libls/cmp.c
@@ -1,13 +1,26 @@
-/*	$OpenBSD: cmp.c,v 1.3 1997/01/03 22:36:07 millert Exp $	*/
-/*	$NetBSD: cmp.c,v 1.10 1996/07/08 10:32:01 mycroft Exp $	*/
+/*
+  Copyright (C) 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) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * Michael Fischbein.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -33,6 +46,9 @@
  * SUCH DAMAGE.
  */
 
+/* This code is derived from software contributed to Berkeley by
+   Michael Fischbein. */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/libls/extern.h b/libls/extern.h
index eef0cdc..1bfcbf6 100644
--- a/libls/extern.h
+++ b/libls/extern.h
@@ -1,7 +1,23 @@
-/*	$OpenBSD: extern.h,v 1.5 1999/11/26 23:02:54 millert Exp $	*/
-/*	$NetBSD: extern.h,v 1.5 1995/03/21 09:06:24 cgd Exp $	*/
+/*
+  Copyright (C) 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) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -13,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -28,8 +44,6 @@
  * 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.
- *
- *	@(#)extern.h	8.1 (Berkeley) 5/31/93
  */
 
 int acccmp (const FTSENT *, const FTSENT *);
diff --git a/libls/fts.c b/libls/fts.c
index d2d9883..cf10252 100644
--- a/libls/fts.c
+++ b/libls/fts.c
@@ -1,4 +1,23 @@
-/*-
+/*
+  Copyright (C) 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) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,11 +29,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -31,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/libls/fts.h b/libls/fts.h
index 00aff1b..4123e64 100644
--- a/libls/fts.h
+++ b/libls/fts.h
@@ -1,4 +1,23 @@
 /*
+  Copyright (C) 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) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,11 +29,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -29,8 +44,6 @@
  * 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.
- *
- *	@(#)fts.h	8.3 (Berkeley) 8/14/94
  */
 
 #ifndef _FTS_H
diff --git a/libls/ls.c b/libls/ls.c
index 63ff2f4..bac4c7c 100644
--- a/libls/ls.c
+++ b/libls/ls.c
@@ -1,13 +1,26 @@
-/*	$OpenBSD: ls.c,v 1.13 1999/05/01 23:54:47 deraadt Exp $	*/
-/*	$NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $	*/
+/*
+  Copyright (C) 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) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * Michael Fischbein.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -33,25 +46,8 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+/* This code is derived from software contributed to Berkeley by
+   Michael Fischbein.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libls/ls.h b/libls/ls.h
index 5e89710..606146f 100644
--- a/libls/ls.h
+++ b/libls/ls.h
@@ -1,13 +1,26 @@
-/*	$OpenBSD: ls.h,v 1.4 1999/05/01 23:54:47 deraadt Exp $	*/
-/*	$NetBSD: ls.h,v 1.7 1995/03/21 09:06:33 cgd Exp $	*/
+/*
+  Copyright (C) 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) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * Michael Fischbein.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -31,10 +44,11 @@
  * 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.
- *
- *	@(#)ls.h	8.1 (Berkeley) 5/31/93
  */
 
+/* This code is derived from software contributed to Berkeley by
+   Michael Fischbein.  */
+
 #define NO_PRINT	1
 
 extern long blocksize;		/* block size units */
diff --git a/libls/print.c b/libls/print.c
index 831c85c..ca7b4fa 100644
--- a/libls/print.c
+++ b/libls/print.c
@@ -1,13 +1,26 @@
-/*	$OpenBSD: print.c,v 1.15 2000/01/06 21:32:40 espie Exp $	*/
-/*	$NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $	*/
+/*
+  Copyright (C) 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) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * Michael Fischbein.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -33,25 +46,8 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+/* This code is derived from software contributed to Berkeley by
+   Michael Fischbein.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libls/stat_flags.c b/libls/stat_flags.c
index f0bbeed..476a5a1 100644
--- a/libls/stat_flags.c
+++ b/libls/stat_flags.c
@@ -1,7 +1,23 @@
-/*	$OpenBSD: stat_flags.c,v 1.4 1999/09/08 07:21:29 millert Exp $	*/
-/*	$NetBSD: stat_flags.c,v 1.5 1995/09/07 06:43:01 jtc Exp $	*/
+/*
+  Copyright (C) 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) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -13,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libls/util.c b/libls/util.c
index e2af7a7..8cc1d9d 100644
--- a/libls/util.c
+++ b/libls/util.c
@@ -1,13 +1,26 @@
-/*	$OpenBSD: util.c,v 1.6 1999/05/05 07:06:01 deraadt Exp $	*/
-/*	$NetBSD: util.c,v 1.12 1995/09/07 06:43:02 jtc Exp $	*/
+/*
+  Copyright (C) 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) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * Michael Fischbein.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -33,6 +46,9 @@
  * SUCH DAMAGE.
  */
 
+/* This code is derived from software contributed to Berkeley by
+   Michael Fischbein.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/libtelnet/Makefile.am b/libtelnet/Makefile.am
index a0285e6..a234750 100644
--- a/libtelnet/Makefile.am
+++ b/libtelnet/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 INCLUDES = @INCAUTH@
 
diff --git a/libtelnet/auth-proto.h b/libtelnet/auth-proto.h
index c3247d3..8dcabea 100644
--- a/libtelnet/auth-proto.h
+++ b/libtelnet/auth-proto.h
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 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 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
@@ -15,11 +15,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -46,8 +44,6 @@
  * 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.
- *
- *	@(#)auth-proto.h	8.1 (Berkeley) 6/4/93
  */
 
 /*
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index 20d7196..143fb1f 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -1,13 +1,14 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1993, 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 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
@@ -15,11 +16,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libtelnet/auth.h b/libtelnet/auth.h
index 8aa4495..1102c35 100644
--- a/libtelnet/auth.h
+++ b/libtelnet/auth.h
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 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 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
@@ -15,11 +15,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -46,8 +44,6 @@
  * 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.
- *
- *	@(#)auth.h	8.1 (Berkeley) 6/4/93
  */
 
 /*
diff --git a/libtelnet/enc-proto.h b/libtelnet/enc-proto.h
index cd18756..2e09f28 100644
--- a/libtelnet/enc-proto.h
+++ b/libtelnet/enc-proto.h
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 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 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
@@ -15,11 +15,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -46,8 +44,6 @@
  * 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.
- *
- *	@(#)enc-proto.h	8.1 (Berkeley) 6/4/93
  */
 
 /*
diff --git a/libtelnet/enc_des.c b/libtelnet/enc_des.c
index 271eac7..d7f875d 100644
--- a/libtelnet/enc_des.c
+++ b/libtelnet/enc_des.c
@@ -1,13 +1,14 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1993, 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 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
@@ -15,11 +16,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index 0dd7d32..a7056ec 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -1,13 +1,14 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1993, 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 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
@@ -15,11 +16,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libtelnet/encrypt.h b/libtelnet/encrypt.h
index 62f3223..600cac3 100644
--- a/libtelnet/encrypt.h
+++ b/libtelnet/encrypt.h
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 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 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
@@ -15,11 +15,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -46,8 +44,6 @@
  * 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.
- *
- *	@(#)encrypt.h	8.1 (Berkeley) 6/4/93
  */
 
 /*
diff --git a/libtelnet/forward.c b/libtelnet/forward.c
index 021fce8..14012ee 100644
--- a/libtelnet/forward.c
+++ b/libtelnet/forward.c
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 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 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
@@ -15,11 +15,9 @@
   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/>.
-*/
+  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.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libtelnet/genget.c b/libtelnet/genget.c
index 2be014f..0328f7a 100644
--- a/libtelnet/genget.c
+++ b/libtelnet/genget.c
@@ -1,13 +1,14 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1993, 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 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
@@ -15,11 +16,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libtelnet/genget.h b/libtelnet/genget.h
index 3763248..2206dbc 100644
--- a/libtelnet/genget.h
+++ b/libtelnet/genget.h
@@ -1,2 +1,20 @@
+/*
+  Copyright (C) 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/'. */
+
 int isprefix (register char *s1, register char *s2);
 char **genget (char *name, char **table, int stlen);
diff --git a/libtelnet/getent.c b/libtelnet/getent.c
index c7b28e6..683d7fb 100644
--- a/libtelnet/getent.c
+++ b/libtelnet/getent.c
@@ -1,13 +1,14 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1993, 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 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
@@ -15,11 +16,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libtelnet/kerberos.c b/libtelnet/kerberos.c
index cc885c9..d512557 100644
--- a/libtelnet/kerberos.c
+++ b/libtelnet/kerberos.c
@@ -1,13 +1,14 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 1993, 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 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
@@ -15,11 +16,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index 0182fe5..edc4bb2 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -1,12 +1,14 @@
 /*
-  Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+  Copyright (C) 1993, 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 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
@@ -14,9 +16,7 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/libtelnet/key-proto.h b/libtelnet/key-proto.h
index 2bbcc7d..c939123 100644
--- a/libtelnet/key-proto.h
+++ b/libtelnet/key-proto.h
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 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 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
@@ -15,11 +15,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -46,8 +44,6 @@
  * 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.
- *
- *	@(#)key-proto.h	8.1 (Berkeley) 6/4/93
  */
 
 /*
diff --git a/libtelnet/misc-proto.h b/libtelnet/misc-proto.h
index d0c570f..af52181 100644
--- a/libtelnet/misc-proto.h
+++ b/libtelnet/misc-proto.h
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 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 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
@@ -15,11 +15,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -46,8 +44,6 @@
  * 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.
- *
- *	@(#)misc-proto.h	8.1 (Berkeley) 6/4/93
  */
 
 /*
diff --git a/libtelnet/misc.c b/libtelnet/misc.c
index 49a89d2..92b436c 100644
--- a/libtelnet/misc.c
+++ b/libtelnet/misc.c
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 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 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
@@ -15,11 +15,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libtelnet/misc.h b/libtelnet/misc.h
index 8442b1a..bdef8c1 100644
--- a/libtelnet/misc.h
+++ b/libtelnet/misc.h
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 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 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
@@ -15,11 +15,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -46,8 +44,6 @@
  * 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.
- *
- *	@(#)misc.h	8.1 (Berkeley) 6/4/93
  */
 
 extern char *UserNameRequested;
diff --git a/libtelnet/read_passwd.c b/libtelnet/read_passwd.c
index 4bd4911..9acf63c 100644
--- a/libtelnet/read_passwd.c
+++ b/libtelnet/read_passwd.c
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-                2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 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 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
@@ -15,11 +15,9 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/*-
+/*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/libtelnet/shishi.c b/libtelnet/shishi.c
index 5c38239..43d06ff 100644
--- a/libtelnet/shishi.c
+++ b/libtelnet/shishi.c
@@ -1,13 +1,13 @@
 /*
-  Copyright (C) 2003, 2004, 2005, 2006, 2007,
-                2008, 2009 Free Software Foundation, Inc.
+  Copyright (C) 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 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
@@ -15,9 +15,7 @@
   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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 /* Written by Simon Josefsson and Nicolas Pouvesle, based on
    kerberos5.c from GNU Inetutils. */
diff --git a/logger/Makefile.am b/logger/Makefile.am
index 49c685d..8316517 100644
--- a/logger/Makefile.am
+++ b/logger/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @logger_BUILD@
 
diff --git a/logger/logger.c b/logger/logger.c
index 1376e19..d5c684d 100644
--- a/logger/logger.c
+++ b/logger/logger.c
@@ -1,21 +1,20 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/paths b/paths
index b43412c..a0117f2 100644
--- a/paths
+++ b/paths
@@ -1,23 +1,22 @@
-# Paths for inetutils
+# paths - Paths for inetutils
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
-# Copyright (C) 1996, 1997, 2000, 2007, 2009 Free Software Foundation, Inc.
+# This file is part of GNU Inetutils.
 #
-# This program is free software; you can redistribute it and/or modify
+# 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, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
 #
-# This program 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.
+# 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, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-#
 # This file describes how to set various paths used by programs in inetutils.
 #
 # The rules that determine what a given PATH_FOO define expands to are:
diff --git a/ping/Makefile.am b/ping/Makefile.am
index d18b004..4697252 100644
--- a/ping/Makefile.am
+++ b/ping/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @ping_BUILD@ @ping6_BUILD@
 
diff --git a/ping/README.sec b/ping/README.sec
deleted file mode 100644
index f6e4e46..0000000
--- a/ping/README.sec
+++ /dev/null
@@ -1,38 +0,0 @@
-CERT* Advisory CA-96.26
-
-Original issue date: December 18, 1996
-Last Revised: December 5, 1997
-Updated information for NCR Corporation. 
-
-A complete revision history is at the end of this file. 
-
-Description
-
-The TCP/IP specification (the basis for many protocols used on the 
-	Internet) allows for a maximum packet size of up to 65536 octets (1 
-	    octet = 8 bits of data), containing a minimum of 20 octets of IP header 
-	information and 0 or more octets of optional information, with the rest 
-	of the packet being data. It is known that some systems will react in an 
-	unpredictable fashion when receiving oversized IP packets. Reports 
-	indicate a range of reactions including crashing, freezing, and 
-	rebooting. 
-
-	In particular, the reports received by the CERT Coordination Center 
-	indicate that Internet Control Message Protocol (ICMP) packets issued 
-	via the "ping" command have been used to trigger this behavior. ICMP is 
-	a subset of the TCP/IP suite of protocols that transmits error and 
-	control messages between systems. Two specific instances of the ICMP are 
-	the ICMP ECHO_REQUEST and ICMP ECHO_RESPONSE datagrams. These two 
-	instances can be used by a local host to determine whether a remote 
-	system is reachable via the network; this is commonly achieved using the 
-	"ping" command. 
-
-	Discussion in public forums has centered around the use of the "ping" 
-	command to construct oversized ICMP datagrams (which are encapsulated 
-	within an IP packet). Many ping implementations by default send ICMP 
-	datagrams consisting only of the 8 octets of ICMP header information but 
-	allow the user to specify a larger packet size if desired. 
-
-	You can read more information about this vulnerability on Mike 
-	Bremford's Web page. (Note that this is not a CERT/CC maintained page. 
-	We provide the URL here for your convenience.) 
diff --git a/ping/TODO b/ping/TODO
deleted file mode 100644
index b2307e5..0000000
--- a/ping/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-0	ability to send router discovery, address and maybe timestamp packets
-
diff --git a/ping/libping.c b/ping/libping.c
index 7e56d3d..45eeba0 100644
--- a/ping/libping.c
+++ b/ping/libping.c
@@ -1,21 +1,20 @@
-/* Copyright (C) 1998, 2001, 2005, 2007, 2008 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ping/ping.c b/ping/ping.c
index b194c38..35c261f 100644
--- a/ping/ping.c
+++ b/ping/ping.c
@@ -1,22 +1,21 @@
-/* Copyright (C) 1998,2001, 2002, 2005, 2006, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+/*
+  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ping/ping.h b/ping/ping.h
index f783d21..c7a9306 100644
--- a/ping/ping.h
+++ b/ping/ping.h
@@ -1,21 +1,20 @@
-/* Copyright (C) 1998, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include "ping_common.h"
 
diff --git a/ping/ping6.c b/ping/ping6.c
index a65b875..e4db905 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -1,22 +1,21 @@
-/* Copyright (C) 1998, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+/*
+  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ping/ping6.h b/ping/ping6.h
index d78f971..75c4190 100644
--- a/ping/ping6.h
+++ b/ping/ping6.h
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998, 2004, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include "ping_common.h"
 
diff --git a/ping/ping_address.c b/ping/ping_address.c
index a525e66..bed8093 100644
--- a/ping/ping_address.c
+++ b/ping/ping_address.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 /* NOTE: most of existing routers simply discard ICMP_ADDRESS requests. */
 #ifdef HAVE_CONFIG_H
diff --git a/ping/ping_common.c b/ping/ping_common.c
index 9abb002..7021c4e 100644
--- a/ping/ping_common.c
+++ b/ping/ping_common.c
@@ -1,22 +1,21 @@
-/* Copyright (C) 1998, 2001, 2002, 2004, 2005, 2007, 2008
-   Free Software Foundation, Inc.
+/*
+  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ping/ping_common.h b/ping/ping_common.h
index ac1b6a5..cc711f8 100644
--- a/ping/ping_common.h
+++ b/ping/ping_common.h
@@ -1,21 +1,21 @@
-/* Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+  Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
diff --git a/ping/ping_echo.c b/ping/ping_echo.c
index d7b82d1..d8b6629 100644
--- a/ping/ping_echo.c
+++ b/ping/ping_echo.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 2001, 2002, 2004, 2007, 2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ping/ping_impl.h b/ping/ping_impl.h
index 9a2c71a..9ffd6f5 100644
--- a/ping/ping_impl.h
+++ b/ping/ping_impl.h
@@ -1,22 +1,21 @@
-/* Copyright (C) 1998,2001, 2002, 2005, 2006, 2007, 2008
-   Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #define PING_MAX_DATALEN (65535 - MAXIPLEN - MAXICMPLEN)
 
diff --git a/ping/ping_router.c b/ping/ping_router.c
index 7dc0fab..c5bf0b2 100644
--- a/ping/ping_router.c
+++ b/ping/ping_router.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 2000, 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/ping/ping_timestamp.c b/ping/ping_timestamp.c
index 1e64a63..f7ad826 100644
--- a/ping/ping_timestamp.c
+++ b/ping/ping_timestamp.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 2000, 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/rcp/Makefile.am b/rcp/Makefile.am
index ec4fdad..6b51629 100644
--- a/rcp/Makefile.am
+++ b/rcp/Makefile.am
@@ -1,28 +1,27 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @rcp_BUILD@
 
 EXTRA_PROGRAMS = rcp
 
-rcp_SOURCES = rcp.c util.c
-
-noinst_HEADERS = extern.h
+rcp_SOURCES = rcp.c
 
 @PATHDEFS_MAKE@
 
diff --git a/rcp/extern.h b/rcp/extern.h
deleted file mode 100644
index 0845215..0000000
--- a/rcp/extern.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- * 4. 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.
- *
- *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- */
-
-typedef struct
-{
-  int cnt;
-  char *buf;
-} BUF;
-
-extern int iamremote;
-
-BUF *allocbuf (BUF *, int, int);
-char *colon (char *);
-void lostconn (int);
-void nospace (void);
-int okname (char *);
-void run_err (const char *, ...);
-int susystem (char *, int);
-void verifydir (char *);
diff --git a/rcp/rcp.c b/rcp/rcp.c
index c5727bd..f8af146 100644
--- a/rcp/rcp.c
+++ b/rcp/rcp.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1990, 1992, 1993, 2002
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -64,6 +63,7 @@
 # endif
 #endif
 #include <sys/socket.h>
+#include <sys/wait.h>
 #include <netinet/in.h>
 #ifdef HAVE_NETINET_IN_SYSTM_H
 # include <netinet/in_systm.h>
@@ -95,7 +95,20 @@
 #include <argp.h>
 #include <error.h>
 #include <xalloc.h>
-#include "extern.h"
+
+typedef struct {
+  int cnt;
+  char *buf;
+} BUF;
+
+BUF *allocbuf (BUF *, int, int);
+char *colon (char *);
+void lostconn (int);
+void nospace (void);
+int okname (char *);
+void run_err (const char *, ...);
+int susystem (char *, int);
+void verifydir (char *);
 
 #ifdef KERBEROS
 # include <kerberosIV/des.h>
@@ -1111,3 +1124,121 @@ run_err (const char *fmt, ...)
 
   va_end (ap);
 }
+
+char *
+colon (char *cp)
+{
+  if (*cp == ':')		/* Leading colon is part of file name. */
+    return (0);
+
+  for (; *cp; ++cp)
+    {
+      if (*cp == ':')
+	return (cp);
+      if (*cp == '/')
+	return (0);
+    }
+  return (0);
+}
+
+void
+verifydir (char *cp)
+{
+  struct stat stb;
+
+  if (!stat (cp, &stb))
+    {
+      if (S_ISDIR (stb.st_mode))
+	return;
+      errno = ENOTDIR;
+    }
+  run_err ("%s: %s", cp, strerror (errno));
+  exit (1);
+}
+
+int
+okname (char *cp0)
+{
+  int c;
+  char *cp;
+
+  cp = cp0;
+  do
+    {
+      c = *cp;
+      if (c & 0200)
+	goto bad;
+      if (!isalpha (c) && !isdigit (c) && c != '_' && c != '-')
+	goto bad;
+    }
+  while (*++cp);
+  return (1);
+
+bad:
+  error (0, 0, "%s: invalid user name", cp0);
+  return (0);
+}
+
+int
+susystem (char *s, int userid)
+{
+  sig_t istat, qstat;
+  int status;
+  pid_t pid;
+
+  pid = vfork ();
+  switch (pid)
+    {
+    case -1:
+      return (127);
+
+    case 0:
+      setuid (userid);
+      execl (PATH_BSHELL, "sh", "-c", s, NULL);
+      _exit (127);
+    }
+  istat = signal (SIGINT, SIG_IGN);
+  qstat = signal (SIGQUIT, SIG_IGN);
+  if (waitpid (pid, &status, 0) < 0)
+    status = -1;
+  signal (SIGINT, istat);
+  signal (SIGQUIT, qstat);
+  return (status);
+}
+
+BUF *
+allocbuf (BUF * bp, int fd, int blksize)
+{
+  struct stat stb;
+  size_t size;
+
+  if (fstat (fd, &stb) < 0)
+    {
+      run_err ("fstat: %s", strerror (errno));
+      return (0);
+    }
+#ifndef roundup
+# define roundup(x, y)   ((((x)+((y)-1))/(y))*(y))
+#endif
+  size = roundup (BUFSIZ, blksize);
+  if (size == 0)
+    size = blksize;
+  if (bp->cnt >= size)
+    return (bp);
+  if ((bp->buf = realloc (bp->buf, size)) == NULL)
+    {
+      bp->cnt = 0;
+      run_err ("%s", strerror (errno));
+      return (0);
+    }
+  bp->cnt = size;
+  return (bp);
+}
+
+RETSIGTYPE
+lostconn (int signo)
+{
+  if (!iamremote)
+    error (0, 0, "lost connection");
+  exit (1);
+}
diff --git a/rcp/util.c b/rcp/util.c
deleted file mode 100644
index 1dceb79..0000000
--- a/rcp/util.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- * 4. 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.
- */
-
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/param.h>
-#ifdef HAVE_SYS_SYSMACROS_H
-# include <sys/sysmacros.h>
-#endif
-#include <sys/stat.h>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
-#include <ctype.h>
-#include <err.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <error.h>
-
-#include "extern.h"
-
-char *
-colon (char *cp)
-{
-  if (*cp == ':')		/* Leading colon is part of file name. */
-    return (0);
-
-  for (; *cp; ++cp)
-    {
-      if (*cp == ':')
-	return (cp);
-      if (*cp == '/')
-	return (0);
-    }
-  return (0);
-}
-
-void
-verifydir (char *cp)
-{
-  struct stat stb;
-
-  if (!stat (cp, &stb))
-    {
-      if (S_ISDIR (stb.st_mode))
-	return;
-      errno = ENOTDIR;
-    }
-  run_err ("%s: %s", cp, strerror (errno));
-  exit (1);
-}
-
-int
-okname (char *cp0)
-{
-  int c;
-  char *cp;
-
-  cp = cp0;
-  do
-    {
-      c = *cp;
-      if (c & 0200)
-	goto bad;
-      if (!isalpha (c) && !isdigit (c) && c != '_' && c != '-')
-	goto bad;
-    }
-  while (*++cp);
-  return (1);
-
-bad:
-  error (0, 0, "%s: invalid user name", cp0);
-  return (0);
-}
-
-int
-susystem (char *s, int userid)
-{
-  sig_t istat, qstat;
-  int status;
-  pid_t pid;
-
-  pid = vfork ();
-  switch (pid)
-    {
-    case -1:
-      return (127);
-
-    case 0:
-      setuid (userid);
-      execl (PATH_BSHELL, "sh", "-c", s, NULL);
-      _exit (127);
-    }
-  istat = signal (SIGINT, SIG_IGN);
-  qstat = signal (SIGQUIT, SIG_IGN);
-  if (waitpid (pid, &status, 0) < 0)
-    status = -1;
-  signal (SIGINT, istat);
-  signal (SIGQUIT, qstat);
-  return (status);
-}
-
-BUF *
-allocbuf (BUF * bp, int fd, int blksize)
-{
-  struct stat stb;
-  size_t size;
-
-  if (fstat (fd, &stb) < 0)
-    {
-      run_err ("fstat: %s", strerror (errno));
-      return (0);
-    }
-#ifndef roundup
-# define roundup(x, y)   ((((x)+((y)-1))/(y))*(y))
-#endif
-  size = roundup (BUFSIZ, blksize);
-  if (size == 0)
-    size = blksize;
-  if (bp->cnt >= size)
-    return (bp);
-  if ((bp->buf = realloc (bp->buf, size)) == NULL)
-    {
-      bp->cnt = 0;
-      run_err ("%s", strerror (errno));
-      return (0);
-    }
-  bp->cnt = size;
-  return (bp);
-}
-
-RETSIGTYPE
-lostconn (int signo)
-{
-  if (!iamremote)
-    error (0, 0, "lost connection");
-  exit (1);
-}
diff --git a/rexec/.gitignore b/rexec/.gitignore
new file mode 100644
index 0000000..86ca246
--- /dev/null
+++ b/rexec/.gitignore
@@ -0,0 +1 @@
+rexec
diff --git a/rexec/Makefile.am b/rexec/Makefile.am
index 74d9d74..9c9c614 100644
--- a/rexec/Makefile.am
+++ b/rexec/Makefile.am
@@ -1,20 +1,20 @@
-# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+#
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
 # This file is part of GNU Inetutils.
 #
-# GNU Inetutils is free software; you can redistribute it and/or modify
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @rexec_BUILD@
 
diff --git a/rexec/rexec.c b/rexec/rexec.c
index 9ac9246..524b121 100644
--- a/rexec/rexec.c
+++ b/rexec/rexec.c
@@ -3,21 +3,20 @@
 
   This file is part of GNU Inetutils.
 
-  GNU Inetutils is free software; you can redistribute it and/or modify
+  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.
+  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.
+  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/>.
-*/
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
-/* Written by Giuseppe Scrivano <gscrivano@gnu.org>.  */
+/* Written by Giuseppe Scrivano.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/rexecd/Makefile.am b/rexecd/Makefile.am
index 6c0d033..11f36a1 100644
--- a/rexecd/Makefile.am
+++ b/rexecd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/rexecd/rexecd.c b/rexecd/rexecd.c
index 3346171..a1dd6a8 100644
--- a/rexecd/rexecd.c
+++ b/rexecd/rexecd.c
@@ -1,22 +1,22 @@
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1993, 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.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  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
@@ -30,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -97,6 +97,7 @@
 #include "libinetutils.h"
 
 void die (int code, const char *fmt, ...);
+int doit (int f, struct sockaddr_in *fromp);
 
 const char doc[] = "remote execution daemon";
 
diff --git a/rlogin/Makefile.am b/rlogin/Makefile.am
index 2a40659..19ce2b3 100644
--- a/rlogin/Makefile.am
+++ b/rlogin/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @rlogin_BUILD@
 
diff --git a/rlogin/rlogin.c b/rlogin/rlogin.c
index 3310d68..0530baf 100644
--- a/rlogin/rlogin.c
+++ b/rlogin/rlogin.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * rlogin - remote login
  */
diff --git a/rlogind/Makefile.am b/rlogind/Makefile.am
index e1596d8..7b645c2 100644
--- a/rlogind/Makefile.am
+++ b/rlogind/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/rlogind/rlogind.c b/rlogind/rlogind.c
index 5aa91a1..1713572 100644
--- a/rlogind/rlogind.c
+++ b/rlogind/rlogind.c
@@ -1,22 +1,22 @@
-/* Copyright (C) 1998, 2001, 2002, 2006,
-   2007, 2008, 2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1993, 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.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -76,6 +76,7 @@
 #endif
 #include <sys/ioctl.h>
 #include <sys/stat.h>		/* Needed for chmod() */
+#include <pty.h>
 
 #include <progname.h>
 #include <argp.h>
diff --git a/rsh/Makefile.am b/rsh/Makefile.am
index 1ecd01f..07adefa 100644
--- a/rsh/Makefile.am
+++ b/rsh/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @rsh_BUILD@
 
diff --git a/rsh/rsh.c b/rsh/rsh.c
index 2c33509..cc36cc1 100644
--- a/rsh/rsh.c
+++ b/rsh/rsh.c
@@ -1,4 +1,23 @@
-/*-
+/*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/rshd/Makefile.am b/rshd/Makefile.am
index 686b10e..6e5ca78 100644
--- a/rshd/Makefile.am
+++ b/rshd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/rshd/rshd.c b/rshd/rshd.c
index 89232fc..38bc10b 100644
--- a/rshd/rshd.c
+++ b/rshd/rshd.c
@@ -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) 1988, 1989, 1992, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +47,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * remote shell server:
  *	[port]\0
diff --git a/syslogd/Makefile.am b/syslogd/Makefile.am
index 7da875c..e82a637 100644
--- a/syslogd/Makefile.am
+++ b/syslogd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/syslogd/README.sec b/syslogd/README.sec
deleted file mode 100644
index c16aef3..0000000
--- a/syslogd/README.sec
+++ /dev/null
@@ -1,26 +0,0 @@
-CERT* Advisory CA-95.13
-
-Original issue date: October 19, 1995
-Last revised: September 23, 1997 
-Updated copyright statement 
-
-Description
-
-The syslog(3) subroutine uses an internal buffer for building messages 
-that are sent to the syslogd(8) daemon. This subroutine does no range 
-checking on data stored in this buffer. It is possible to overflow the 
-internal buffer and rewrite the subroutine call stack. It is then 
-possible to execute arbitrary programs. 
-
-This problem is present in virtually all versions of the UNIX Operating 
-System except the following: 
-
-
-	Sony's NEWS-OS 6.X
-		SunOS 5.5 (Solaris 2.5)
-    	Linux with libc version 4.7.2 released in May, 1995 
-
-
-	The sendmail(8) program uses the syslog(3) subroutine, and a script has 
-	been written and is being used to exploit the vulnerability. 
-
diff --git a/syslogd/syslogd.c b/syslogd/syslogd.c
index ccaae53..9443846 100644
--- a/syslogd/syslogd.c
+++ b/syslogd/syslogd.c
@@ -1,5 +1,23 @@
 /* syslogd - log system messages
- *
+  Copyright (C) 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) 1983, 1988, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -11,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -28,27 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
-
 /*
  *  syslogd -- log system messages
  *
@@ -141,7 +138,7 @@
 /* A mask of all facilities mentioned explicitly in the configuration file
  *
  * This is used to support a virtual facility "**" that covers all the rest,
- * so that messages to unexpected facilities won't be lost when "*" is 
+ * so that messages to unexpected facilities won't be lost when "*" is
  * not logged to a file.
  */
 int facilities_seen;
@@ -444,7 +441,7 @@ main (int argc, char *argv[])
   unsigned long nfds = 0;
 
   set_program_name (argv[0]);
-  
+
   /* Initiliaze PATH_LOG as the first element of the unix sockets array.  */
   add_funix (PATH_LOG);
 
@@ -662,8 +659,8 @@ main (int argc, char *argv[])
 		      }
 
 		    /* This loop makes sure the daemon won't lock up
-		     * on null bytes in the klog stream.  They still hurt 
-		     * efficiency, acting like a message separator that 
+		     * on null bytes in the klog stream.  They still hurt
+		     * efficiency, acting like a message separator that
 		     * forces a shift-and-reiterate when the buffer was
 		     * never full.
 		     */
@@ -678,7 +675,7 @@ main (int argc, char *argv[])
 
 		    if (bol != kline)
 		      {
-			/* shift the partial line to start of buffer, so 
+			/* shift the partial line to start of buffer, so
 			 * we can re-iterate.
 			 */
 			memmove (kline, bol, kline_len);
@@ -694,11 +691,11 @@ main (int argc, char *argv[])
 			 */
 			printsys (kline);
 
-			/* Clone priority signal if present 
+			/* Clone priority signal if present
 			 * We merely shift the kline_len pointer after
 			 * it so the next chunk is written after it.
 			 *
-			 * strchr(kline,'>') is not used as it would allow 
+			 * strchr(kline,'>') is not used as it would allow
 			 * a pathological line ending in '>' to cause an
 			 * endless loop.
 			 */
@@ -1859,7 +1856,7 @@ cfline (const char *line, struct filed *f)
 	  if (*buf == '*')
 	    for (i = 0; i <= LOG_NFACILITIES; i++)
 	      {
-		/* make "**" act as a wildcard only for facilities not 
+		/* make "**" act as a wildcard only for facilities not
 		 * specified elsewhere
 		 */
 		if (buf[1] == '*' && ((1 << i) & facilities_seen))
diff --git a/talk/Makefile.am b/talk/Makefile.am
index 54bab9f..bd1cc01 100644
--- a/talk/Makefile.am
+++ b/talk/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @talk_BUILD@
 
diff --git a/talk/ctl.c b/talk/ctl.c
index 262d007..4e7e7bf 100644
--- a/talk/ctl.c
+++ b/talk/ctl.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * This file handles haggling with the various talk daemons to
  * get a socket to talk to. sockt is opened and connected in
diff --git a/talk/ctl_transact.c b/talk/ctl_transact.c
index 898fb5d..3d443f3 100644
--- a/talk/ctl_transact.c
+++ b/talk/ctl_transact.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/talk/display.c b/talk/display.c
index 57e631d..9df8ad7 100644
--- a/talk/display.c
+++ b/talk/display.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * The window 'manager', initializes curses and handles the actual
  * displaying of text
diff --git a/talk/get_addrs.c b/talk/get_addrs.c
index 875393c..e03e7c8 100644
--- a/talk/get_addrs.c
+++ b/talk/get_addrs.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/talk/get_names.c b/talk/get_names.c
index c1d4b2c..2e92d13 100644
--- a/talk/get_names.c
+++ b/talk/get_names.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/talk/init_disp.c b/talk/init_disp.c
index 58da496..06bf023 100644
--- a/talk/init_disp.c
+++ b/talk/init_disp.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #include <stdlib.h>
 
 /*
diff --git a/talk/invite.c b/talk/invite.c
index 79cc0fc..6875755 100644
--- a/talk/invite.c
+++ b/talk/invite.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/talk/io.c b/talk/io.c
index b0d198b..434f70d 100644
--- a/talk/io.c
+++ b/talk/io.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * This file contains the I/O handling and the exchange of
  * edit characters. This connection itself is established in
diff --git a/talk/look_up.c b/talk/look_up.c
index f1f57e6..5eda0ce 100644
--- a/talk/look_up.c
+++ b/talk/look_up.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/talk/msgs.c b/talk/msgs.c
index c5a5a83..bc25314 100644
--- a/talk/msgs.c
+++ b/talk/msgs.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 /*
  * A package to display what is happening every MSG_INTERVAL seconds
  * if we are slow connecting.
diff --git a/talk/talk.c b/talk/talk.c
index f7534d7..50e77f3 100644
--- a/talk/talk.c
+++ b/talk/talk.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/talk/talk.h b/talk/talk.h
index 8f154bd..b5358b1 100644
--- a/talk/talk.h
+++ b/talk/talk.h
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -25,30 +44,8 @@
  * 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.
- *
- *	@(#)talk.h	8.1 (Berkeley) 6/6/93
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #include <curses.h>
 #include <progname.h>
 
diff --git a/talk/talk_ctl.h b/talk/talk_ctl.h
index d1578db..d1f5f1b 100644
--- a/talk/talk_ctl.h
+++ b/talk/talk_ctl.h
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -25,30 +44,8 @@
  * 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.
- *
- *	@(#)talk_ctl.h	8.1 (Berkeley) 6/6/93
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 extern struct sockaddr_in daemon_addr;
 extern struct sockaddr_in ctl_addr;
 extern struct sockaddr_in my_addr;
diff --git a/talkd/Makefile.am b/talkd/Makefile.am
index 0b0fe09..632a49b 100644
--- a/talkd/Makefile.am
+++ b/talkd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/talkd/README.sec b/talkd/README.sec
deleted file mode 100644
index cd17cc8..0000000
--- a/talkd/README.sec
+++ /dev/null
@@ -1,27 +0,0 @@
-CERT* Advisory CA-97.04
-
-Original issue date: January 27, 1997
-Last Revised: September 26, 1997
-Updated copyright statement 
-Description
-
-The CERT Coordination Center has received information of a vulnerability 
-in the talkd(8) program used by talk(1). talk is a communication program 
-that copies text from one user's terminal to that of another, possibly 
-remote, user. talkd is the daemon that notifies a user that someone else 
-wishes to initiate a talk conversation. 
-As part of the talk connection, talkd does a DNS lookup for the name of 
-the host that the connection is being initiated from. Because there is 
-insufficient bounds checking on the buffer where the hostname is stored, 
-it is possible to overwrite the internal stack space of talkd. 
-It is possible to force talkd to execute arbitrary commands by carefully 
-manipulating the hostname information. As talkd runs with root 
-privileges, this may allow intruders to remotely execute arbitrary 
-commands with these privileges. 
-This attack requires an intruder to be able to make a network connection 
-to a vulnerable talkd program and provide corrupt DNS information to 
-that host. 
-This type of attack is a particular instance of the problem described in 
-CERT advisory CA-96.04, "Corrupt Information from Network Servers," 
-available from 
----------------------------------------------------------------------
diff --git a/talkd/acl.c b/talkd/acl.c
index 27e09ba..309f440 100644
--- a/talkd/acl.c
+++ b/talkd/acl.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <intalkd.h>
 #include <pwd.h>
diff --git a/talkd/announce.c b/talkd/announce.c
index b48c94e..7737d99 100644
--- a/talkd/announce.c
+++ b/talkd/announce.c
@@ -1,21 +1,22 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  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.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <intalkd.h>
 #include <stdarg.h>
diff --git a/talkd/intalkd.h b/talkd/intalkd.h
index 9f0b16e..016a549 100644
--- a/talkd/intalkd.h
+++ b/talkd/intalkd.h
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/talkd/print.c b/talkd/print.c
index fa82712..43a5e49 100644
--- a/talkd/print.c
+++ b/talkd/print.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 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.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <intalkd.h>
 
diff --git a/talkd/process.c b/talkd/process.c
index daabb97..a6497f6 100644
--- a/talkd/process.c
+++ b/talkd/process.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 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.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <intalkd.h>
 #include <readutmp.h>
diff --git a/talkd/table.c b/talkd/table.c
index 359b188..2e45041 100644
--- a/talkd/table.c
+++ b/talkd/table.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 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.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <intalkd.h>
 
diff --git a/talkd/talkd.c b/talkd/talkd.c
index edb1195..85b1008 100644
--- a/talkd/talkd.c
+++ b/talkd/talkd.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998, 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 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.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/telnet/Makefile.am b/telnet/Makefile.am
index bd94ee9..d98a5ed 100644
--- a/telnet/Makefile.am
+++ b/telnet/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @telnet_BUILD@
 
diff --git a/telnet/README.sec b/telnet/README.sec
deleted file mode 100644
index a2b5067..0000000
--- a/telnet/README.sec
+++ /dev/null
@@ -1,31 +0,0 @@
-CERT* Advisory CA-95.14
-
-Original issue date: November 1, 1995
-Last revised: October 30, 1997 - Updated vendor information for Sun. 
-
-Description
-
-Some telnet daemons support RFC 1408 or RFC 1572, both titled "Telnet 
-Environment Option." This extension to telnet provides the ability to 
-transfer environment variables from one system to another. If the remote 
-or targeted system, the one to which the telnet is connecting, is 
-running an RFC 1408/RFC 1572-compliant telnet daemon *and* the targeted 
-system also supports shared object libraries, then it may be possible to 
-transfer environment variables that influence the login program called 
-by the telnet daemon. By influencing that targeted system, a user may be 
-able to bypass the normal login and authentication scheme and may become 
-root on that system. 
-
-Users with accounts on the targeted system can exploit this 
-vulnerability. Users without accounts on that system can also exploit 
-this vulnerability if they are first able to deposit an altered shared 
-object library onto the targeted system. Therefore, a system may be 
-vulnerable to users with and without local accounts. 
-
-Not all systems that run an RFC 1408/RFC 1572-compliant telnet daemon 
-and support shared object libraries are vulnerable. Some vendors have 
-changed the trust model such that environment variables provided by the 
-telnet daemon are not trusted and therefore are not used by the login 
-program. Section III contains a summary of information vendors have 
-reported as of the date of this advisory. 
---------------------------------------
diff --git a/telnet/authenc.c b/telnet/authenc.c
index 0f08fca..db2950b 100644
--- a/telnet/authenc.c
+++ b/telnet/authenc.c
@@ -1,4 +1,23 @@
-/*-
+/*
+  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/'. */
+
+/*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/telnet/commands.c b/telnet/commands.c
index 3c2404d..e1491b4 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/telnet/defines.h b/telnet/defines.h
index dee19cc..2b0a860 100644
--- a/telnet/defines.h
+++ b/telnet/defines.h
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -25,8 +44,6 @@
  * 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.
- *
- *	@(#)defines.h	8.1 (Berkeley) 6/6/93
  */
 
 #define settimer(x)	clocks.x = clocks.system++
diff --git a/telnet/externs.h b/telnet/externs.h
index f98d796..8810558 100644
--- a/telnet/externs.h
+++ b/telnet/externs.h
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -25,30 +44,8 @@
  * 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.
- *
- *	@(#)externs.h	8.3 (Berkeley) 5/30/95
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #include <unistd.h>
 
 #ifndef BSD
diff --git a/telnet/fdset.h b/telnet/fdset.h
index 8055650..22e8970 100644
--- a/telnet/fdset.h
+++ b/telnet/fdset.h
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -25,8 +44,6 @@
  * 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.
- *
- *	@(#)fdset.h	8.1 (Berkeley) 6/6/93
  */
 
 /*
diff --git a/telnet/general.h b/telnet/general.h
index 1d91428..7d1a0bf 100644
--- a/telnet/general.h
+++ b/telnet/general.h
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -25,8 +44,6 @@
  * 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.
- *
- *	@(#)general.h	8.1 (Berkeley) 6/6/93
  */
 
 /*
diff --git a/telnet/krb4-proto.h b/telnet/krb4-proto.h
index 3afcb92..d4237d1 100644
--- a/telnet/krb4-proto.h
+++ b/telnet/krb4-proto.h
@@ -1,3 +1,22 @@
+/*
+  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/'. */
+
 /* add_ticket.c */
 int add_ticket (KTEXT, int, char *, int, char *, char *, char *, int, KTEXT);
 
diff --git a/telnet/main.c b/telnet/main.c
index 536100e..fd2dddf 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,23 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 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, 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 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 GNU Inetutils; If not, see <http://www.gnu.org/licenses/>. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/telnet/network.c b/telnet/network.c
index f60b9bb..6a70772 100644
--- a/telnet/network.c
+++ b/telnet/network.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/telnet/ring.c b/telnet/ring.c
index 4f4956b..70f8d58 100644
--- a/telnet/ring.c
+++ b/telnet/ring.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/telnet/ring.h b/telnet/ring.h
index 31a8106..e7500e5 100644
--- a/telnet/ring.h
+++ b/telnet/ring.h
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -25,31 +44,8 @@
  * 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.
- *
- *	@(#)ring.h	8.1 (Berkeley) 6/6/93
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
-
 /*
  * This defines a structure for a ring buffer.
  *
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index 8826d3f..f1a7f95 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/telnet/telnet.c b/telnet/telnet.c
index d16cd1d..54709df 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/telnet/terminal.c b/telnet/terminal.c
index d08d738..dc96c41 100644
--- a/telnet/terminal.c
+++ b/telnet/terminal.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/telnet/tn3270.c b/telnet/tn3270.c
index cb31f99..4afd957 100644
--- a/telnet/tn3270.c
+++ b/telnet/tn3270.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/telnet/types.h b/telnet/types.h
index 7d9ceb6..5704da3 100644
--- a/telnet/types.h
+++ b/telnet/types.h
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -25,8 +44,6 @@
  * 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.
- *
- *	@(#)types.h	8.1 (Berkeley) 6/6/93
  */
 
 typedef struct
diff --git a/telnet/utilities.c b/telnet/utilities.c
index ef0a34b..46151fd 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,26 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-   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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index 4784029..c048c48 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/telnetd/README.sec b/telnetd/README.sec
deleted file mode 100644
index dd6cb25..0000000
--- a/telnetd/README.sec
+++ /dev/null
@@ -1,11 +0,0 @@
-CERT* Advisory CA-95.03a
-
-Original issue date: March 3, 1995
-Last revised: September 23, 1997
-Updated copyright statement 
-
-Description
-
-There is a vulnerability in Berkeley Telnet clients that support 
-encryption and Kerberos V4 authentications. This vulnerability 
-substantially reduces the effectiveness of the encryption. 
diff --git a/telnetd/pty.c b/telnetd/pty.c
index 1050c7a..2835379 100644
--- a/telnetd/pty.c
+++ b/telnetd/pty.c
@@ -1,24 +1,25 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
+  Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include "telnetd.h"
 #include <sys/wait.h>
+#include <pty.h>
 
 #ifdef AUTHENTICATION
 # include <libtelnet/auth.h>
diff --git a/telnetd/slc.c b/telnetd/slc.c
index 821d317..44764a3 100644
--- a/telnetd/slc.c
+++ b/telnetd/slc.c
@@ -1,4 +1,24 @@
 /*
+  Copyright (C) 1993, 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) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/telnetd/state.c b/telnetd/state.c
index d4f5f3a..0e59456 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -1,6 +1,26 @@
 /*
+  Copyright (C) 1993, 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) 1989, 1993
- *      The Regents of the University of California.  All rights reserved.
+ *	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
@@ -10,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 67acf71..1b840da 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -1,22 +1,22 @@
-/* Copyright (C) 1998, 2001, 2002, 2004, 2006, 2007,
-   2009 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1993, 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.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include "telnetd.h"
 
diff --git a/telnetd/telnetd.h b/telnetd/telnetd.h
index cc23d45..a9f510d 100644
--- a/telnetd/telnetd.h
+++ b/telnetd/telnetd.h
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998,2001,2005,2006,2007,2008 Free Software Foundation, Inc.
+/*
+  Copyright (C) 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.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/telnetd/term.c b/telnetd/term.c
index ccf34c7..223da38 100644
--- a/telnetd/term.c
+++ b/telnetd/term.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1998,2001,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
+  Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include <telnetd.h>
 
diff --git a/telnetd/termstat.c b/telnetd/termstat.c
index 5fd4f2b..83d5b6f 100644
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -1,4 +1,24 @@
 /*
+  Copyright (C) 1993, 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) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/telnetd/utility.c b/telnetd/utility.c
index da9ab68..58edcb6 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -1,21 +1,22 @@
-/* Copyright (C) 1998,2001,2005,2006,2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 1993, 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.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #define TELOPTS
 #define TELCMDS
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 541534c..cf615df 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,20 +1,20 @@
-# Copyright (C) 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 AM_CPPFLAGS = -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib
 
diff --git a/tests/localhost.c b/tests/localhost.c
index 8ab3c63..14ca0bc 100644
--- a/tests/localhost.c
+++ b/tests/localhost.c
@@ -1,21 +1,20 @@
-/* Copyright (C) 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is part of GNU Inetutils.
+  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, or (at your option)
-   any later version.
+  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 PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
 #include "libinetutils.h"
 
diff --git a/tftp/Makefile.am b/tftp/Makefile.am
index 209dfe6..e5e8e05 100644
--- a/tftp/Makefile.am
+++ b/tftp/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# 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
 
diff --git a/tftp/extern.h b/tftp/extern.h
index 9616563..e654bef 100644
--- a/tftp/extern.h
+++ b/tftp/extern.h
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -25,8 +44,6 @@
  * 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.
- *
- *	@(#)extern.h	8.1 (Berkeley) 6/6/93
  */
 
 void recvfile (int, char *, char *);
diff --git a/tftp/main.c b/tftp/main.c
index 26fb709..142d7fe 100644
--- a/tftp/main.c
+++ b/tftp/main.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/tftp/tftp.c b/tftp/tftp.c
index 8b6352d..daec4b3 100644
--- a/tftp/tftp.c
+++ b/tftp/tftp.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
diff --git a/tftpd/Makefile.am b/tftpd/Makefile.am
index fdadf17..356b950 100644
--- a/tftpd/Makefile.am
+++ b/tftpd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c
index 57fc9df..62258ec 100644
--- a/tftpd/tftpd.c
+++ b/tftpd/tftpd.c
@@ -1,4 +1,23 @@
 /*
+  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/'. */
+
+/*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,7 +29,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -27,23 +46,6 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 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, 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 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 GNU Inetutils; If not, see <http://www.gnu.org/licenses/>. */
-
 /*
  * Trivial file transfer protocol server.
  *
diff --git a/traceroute/Makefile.am b/traceroute/Makefile.am
index db699dc..2ba94d0 100644
--- a/traceroute/Makefile.am
+++ b/traceroute/Makefile.am
@@ -1,20 +1,20 @@
-# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @traceroute_BUILD@
 
@@ -22,8 +22,6 @@ EXTRA_PROGRAMS = traceroute
 
 traceroute_SOURCES = traceroute.c
 
-noinst_HEADERS = traceroute.h
-
 INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libicmp -I$(top_srcdir)/libinetutils
 
 LDADD = -L../libicmp -licmp -L../lib -lgnu
diff --git a/traceroute/traceroute.c b/traceroute/traceroute.c
index 2e5077d..ab40376 100644
--- a/traceroute/traceroute.c
+++ b/traceroute/traceroute.c
@@ -1,26 +1,22 @@
-/* Traceroute
-   
-   Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
-   
-   This file is part of GNU Inetutils.
-   
-   Written by Elian Gidoni.
-   
-   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, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 USA.
-*/
+/*
+  Copyright (C) 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/'. */
+
+/* Written by Elian Gidoni.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -55,8 +51,36 @@
 #include <icmp.h>
 
 #include "libinetutils.h"
-#include "traceroute.h"
-
+
+#define TRACE_UDP_PORT 33434
+#define TRACE_TTL 1
+
+enum trace_type
+{
+  TRACE_UDP,			/* UDP datagrams.  */
+  TRACE_ICMP,			/* ICMP echo requests.  */
+  TRACE_1393			/* RFC 1393 requests. */
+};
+
+typedef struct trace
+{
+  int icmpfd, udpfd;
+  enum trace_type type;
+  struct sockaddr_in to, from;
+  unsigned char ttl;
+  struct timeval tsent;
+} trace_t;
+
+void trace_init (trace_t * t, const struct sockaddr_in to,
+		 const enum trace_type type);
+void trace_inc_ttl (trace_t * t);
+void trace_inc_port (trace_t * t);
+void trace_port (trace_t * t, const unsigned short port);
+int trace_read (trace_t * t);
+int trace_write (trace_t * t);
+int trace_udp_sock (trace_t * t);
+int trace_icmp_sock (trace_t * t);
+
 #define TIME_INTERVAL 3
 
 void do_try (trace_t * trace, const int hop,
diff --git a/traceroute/traceroute.h b/traceroute/traceroute.h
deleted file mode 100644
index e9ec8ed..0000000
--- a/traceroute/traceroute.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Traceroute
-   
-   Copyright (C) 2007 Free Software Foundation, Inc.
-   
-   This file is part of GNU Inetutils.
-   
-   Written by Elian Gidoni.
-   
-   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, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 USA.
-*/
-
-#ifndef TRACEROUTE_H
-#define TRACEROUTE_H 1
-
-#define TRACE_UDP_PORT 33434
-#define TRACE_TTL 1
-
-enum trace_type
-{
-  TRACE_UDP,			/* UDP datagrams.  */
-  TRACE_ICMP,			/* ICMP echo requests.  */
-  TRACE_1393			/* RFC 1393 requests. */
-};
-
-typedef struct trace
-{
-  int icmpfd, udpfd;
-  enum trace_type type;
-  struct sockaddr_in to, from;
-  unsigned char ttl;
-  struct timeval tsent;
-} trace_t;
-
-void trace_init (trace_t * t, const struct sockaddr_in to,
-		 const enum trace_type type);
-void trace_inc_ttl (trace_t * t);
-void trace_inc_port (trace_t * t);
-void trace_port (trace_t * t, const unsigned short port);
-int trace_read (trace_t * t);
-int trace_write (trace_t * t);
-int trace_udp_sock (trace_t * t);
-int trace_icmp_sock (trace_t * t);
-
-#endif /* TRACEROUTE_H */
diff --git a/uucpd/Makefile.am b/uucpd/Makefile.am
index 909cc69..7568ac6 100644
--- a/uucpd/Makefile.am
+++ b/uucpd/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/uucpd/uucpd.c b/uucpd/uucpd.c
index 8e7d762..980614e 100644
--- a/uucpd/uucpd.c
+++ b/uucpd/uucpd.c
@@ -1,10 +1,27 @@
 /*
+  Copyright (C) 1993, 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, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
- * This code is derived from software contributed to Berkeley by
- * Rick Adams.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +30,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -30,25 +47,8 @@
  * SUCH DAMAGE.
  */
 
-/* Copyright (C) 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, 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 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 GNU Inetutils; see the file COPYING.  If not, write
-   to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301 USA. */
+/* This code is derived from software contributed to Berkeley by Rick
+   Adams. */
 
 /*
  * 4.2BSD TCP/IP server for uucico
@@ -102,7 +102,6 @@
 #include <libinetutils.h>
 
 void dologin ();
-void usage (void);
 
 struct sockaddr_in hisctladdr;
 int hisaddrlen = sizeof hisctladdr;
@@ -127,13 +126,8 @@ static struct argp argp =
 int
 main (int argc, char **argv)
 {
-#ifndef BSDINETD
   register int s;
-# ifdef BSD4_2
-  register int tcp_socket;
-# endif
   struct servent *sp;
-#endif /* !BSDINETD */
   void dologout ();
 
   set_program_name (argv[0]);
@@ -141,23 +135,6 @@ main (int argc, char **argv)
   argp_parse (&argp, argc, argv, 0, NULL, NULL);
 
   environ = nenv;
-#ifdef BSDINETD
-  close (1);
-  close (2);
-  dup (0);
-  dup (0);
-  hisaddrlen = sizeof (hisctladdr);
-  if (getpeername (0, &hisctladdr, &hisaddrlen) < 0)
-    {
-      fprintf (stderr, "%s: ", argv[0]);
-      perror ("getpeername");
-      _exit (1);
-    }
-  if (fork () == 0)
-    doit (&hisctladdr);
-  dologout ();
-  exit (1);
-#else /* !BSDINETD */
   sp = getservbyname ("uucp", "tcp");
   if (sp == NULL)
     {
@@ -175,49 +152,6 @@ main (int argc, char **argv)
   bzero ((char *) &myctladdr, sizeof (myctladdr));
   myctladdr.sin_family = AF_INET;
   myctladdr.sin_port = sp->s_port;
-# ifdef BSD4_2
-  tcp_socket = socket (AF_INET, SOCK_STREAM, 0);
-  if (tcp_socket < 0)
-    {
-      perror ("uucpd: socket");
-      exit (1);
-    }
-  if (bind (tcp_socket, (char *) &myctladdr, sizeof (myctladdr)) < 0)
-    {
-      perror ("uucpd: bind");
-      exit (1);
-    }
-  listen (tcp_socket, 3);	/* at most 3 simultaneuos uucp connections */
-  signal (SIGCHLD, dologout);
-
-  for (;;)
-    {
-      s = accept (tcp_socket, &hisctladdr, &hisaddrlen);
-      if (s < 0)
-	{
-	  if (errno == EINTR)
-	    continue;
-	  perror ("uucpd: accept");
-	  exit (1);
-	}
-      if (fork () == 0)
-	{
-	  close (0);
-	  close (1);
-	  close (2);
-	  dup (s);
-	  dup (s);
-	  dup (s);
-	  close (tcp_socket);
-	  close (s);
-	  doit (&hisctladdr);
-	  exit (1);
-	}
-      close (s);
-    }
-# endif	/* BSD4_2 */
-
-#endif /* !BSDINETD */
 }
 
 static int
@@ -288,21 +222,11 @@ doit (struct sockaddr_in *sinp)
   sprintf (Username, "USER=%s", user);
   dologin (pw, sinp);
   setgid (pw->pw_gid);
-#ifdef BSD4_2
-  initgroups (pw->pw_name, pw->pw_gid);
-#endif /* BSD4_2 */
   chdir (pw->pw_dir);
   setuid (pw->pw_uid);
-#ifdef BSD4_2
-  execl (UUCICO, "uucico", (char *) 0);
-#endif /* BSD4_2 */
   perror ("uucico server: execl");
 }
 
-#ifdef BSD4_2
-# include <fcntl.h>
-#endif /* BSD4_2 */
-
 void
 dologout ()
 {
@@ -350,7 +274,8 @@ dologin (struct passwd *pw, struct sockaddr_in *sin)
 
 #if defined (PATH_LASTLOG) && defined (HAVE_STRUCT_LASTLOG)
 # define SCPYN(a, b)	strncpy(a, b, sizeof (a))
-  if ((f = open (PATH_LASTLOG, O_RDWR)) >= 0)
+  f = open (PATH_LASTLOG, O_RDWR);
+  if (f >= 0)
     {
       struct lastlog ll;
 
@@ -364,16 +289,3 @@ dologin (struct passwd *pw, struct sockaddr_in *sin)
     }
 #endif
 }
-
-static const char usage_str[] =
-  "Usage: uucpd [OPTIONS...]\n"
-  "\n"
-  "Options are:\n"
-  "       --help              Display usage instructions\n"
-  "       --version           Display program version\n";
-
-void
-usage (void)
-{
-  printf ("%s\n" "Send bug reports to <%s>\n", usage_str, PACKAGE_BUGREPORT);
-}
diff --git a/gwhois/.gitignore b/whois/.gitignore
similarity index 100%
rename from gwhois/.gitignore
rename to whois/.gitignore
diff --git a/gwhois/Makefile.am b/whois/Makefile.am
similarity index 66%
rename from gwhois/Makefile.am
rename to whois/Makefile.am
index 8824e02..1190065 100644
--- a/gwhois/Makefile.am
+++ b/whois/Makefile.am
@@ -1,20 +1,21 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+#
+# Copyright (C) 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
+# 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, or (at your option)
-# any later version.
+# 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 PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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 GNU Inetutils; see the file COPYING.  If not, write
-# to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
 bin_PROGRAMS = @whois_BUILD@
 
diff --git a/gwhois/as_del_list b/whois/as_del_list
similarity index 100%
rename from gwhois/as_del_list
rename to whois/as_del_list
diff --git a/gwhois/data.h b/whois/data.h
similarity index 75%
rename from gwhois/data.h
rename to whois/data.h
index f92de58..17a417d 100644
--- a/gwhois/data.h
+++ b/whois/data.h
@@ -1,4 +1,22 @@
 /*
+  Copyright (C) 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/'. */
+
+/*
  * RIPE-like servers.
  * All of them do not understand -V2.0Md with the exception of RA and RIPN.
  * 6bone-derived servers will accept the flag with a warning (the flag must
diff --git a/gwhois/ip_del_list b/whois/ip_del_list
similarity index 100%
rename from gwhois/ip_del_list
rename to whois/ip_del_list
diff --git a/gwhois/make_as_del.pl b/whois/make_as_del.pl
similarity index 99%
rename from gwhois/make_as_del.pl
rename to whois/make_as_del.pl
index 324d3d2..326dfde 100755
--- a/gwhois/make_as_del.pl
+++ b/whois/make_as_del.pl
@@ -17,4 +17,3 @@ while (<>) {
 	}
 	print "\" },\n";
 }
-
diff --git a/gwhois/make_ip_del.pl b/whois/make_ip_del.pl
similarity index 99%
rename from gwhois/make_ip_del.pl
rename to whois/make_ip_del.pl
index 91ca390..55ac8f5 100755
--- a/gwhois/make_ip_del.pl
+++ b/whois/make_ip_del.pl
@@ -19,4 +19,3 @@ while (<>) {
 	}
 	print "\" },\n";
 }
-
diff --git a/gwhois/make_tld_serv.pl b/whois/make_tld_serv.pl
similarity index 99%
rename from gwhois/make_tld_serv.pl
rename to whois/make_tld_serv.pl
index d2735d6..ec4a7e7 100755
--- a/gwhois/make_tld_serv.pl
+++ b/whois/make_tld_serv.pl
@@ -14,4 +14,3 @@ while (<>) {
 	$b = "\\003" if ($b eq 'NONE');
 	print "    \"$a\",\t\"$b\",\n";
 }
-
diff --git a/gwhois/tld_serv_list b/whois/tld_serv_list
similarity index 100%
rename from gwhois/tld_serv_list
rename to whois/tld_serv_list
diff --git a/gwhois/whois.c b/whois/whois.c
similarity index 95%
rename from gwhois/whois.c
rename to whois/whois.c
index 1c239bf..4c22793 100644
--- a/gwhois/whois.c
+++ b/whois/whois.c
@@ -1,22 +1,23 @@
 /*
-  Copyright (C) 1999, 2007, 2008, 2009 Free Software Foundation, Inc.
-  
-  Written by Marco d'Itri <md@linux.it>.
-  
-  This program is free software; you can redistribute it and/or modify
+  Copyright (C) 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, or (at your option)
-  any later version.
-
-  This program 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.
-  
+  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, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.  */
+  along with this program.  If not, see `http://www.gnu.org/licenses/'. */
+
+/* Written by Marco d'Itri.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -136,7 +137,7 @@ static error_t
 gwhois_argp_parser (int key, char *arg, struct argp_state *state)
 {
   char *p, *q;
-  
+
   switch (key)
     {
     case 'h':
@@ -150,7 +151,7 @@ gwhois_argp_parser (int key, char *arg, struct argp_state *state)
     case 'H':
       hide_discl = 0;	/* enable disclaimers hiding */
       break;
-      
+
     case 'p':
       port = arg;
       break;
@@ -158,13 +159,13 @@ gwhois_argp_parser (int key, char *arg, struct argp_state *state)
     case 'V':
       verb = 1;
       break;
-      
+
     default:
       return ARGP_ERR_UNKNOWN;
     }
   return 0;
 }
-      
+
 struct argp_child gwhois_argp_children[] = {
   { &ripe_argp,
     0,
@@ -195,9 +196,9 @@ main (int argc, char *argv[])
   char *fstring;
   char *qstring;
   char *p;
-  
+
   set_program_name (argv[0]);
-  
+
 #ifdef ENABLE_NLS
   setlocale (LC_MESSAGES, "");
   bindtextdomain (NLS_CAT_NAME, LOCALEDIR);
@@ -228,7 +229,7 @@ main (int argc, char *argv[])
     }
   obstack_1grow (&query_stk, 0);
   qstring = obstack_finish (&query_stk);
-  
+
   if (!server && domfind (qstring, gtlds))
     {
       if (verb)
@@ -386,12 +387,12 @@ is_ripe_server (const char * const *srvtab, const char *name)
   int isip = 0;
 
   isip = inet_aton (name, &addr);
-  
+
   for (; *srvtab; ++srvtab)
     {
       const char *server = *srvtab;
       struct hostent *hp;
-      
+
       if (strcmp (server, name) == 0)
 	return 1;
       if (isip && (hp = gethostbyname (server)) != NULL)
diff --git a/gwhois/whois.h b/whois/whois.h
similarity index 67%
rename from gwhois/whois.h
rename to whois/whois.h
index e7a5153..172c1da 100644
--- a/gwhois/whois.h
+++ b/whois/whois.h
@@ -1,3 +1,22 @@
+/*
+  Copyright (C) 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/'. */
+
 #ifndef _WHOIS_H
 # define _WHOIS_H
 


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sun Nov 08 08:06:58 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N77Tu-0008Fs-8F
	for mharc-commit-inetutils@gnu.org; Sun, 08 Nov 2009 08:06:58 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N77Ts-0008Ea-V0
	for commit-inetutils@gnu.org; Sun, 08 Nov 2009 08:06:56 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N77Tq-0008DR-BG
	for commit-inetutils@gnu.org; Sun, 08 Nov 2009 08:06:55 -0500
Received: from [199.232.76.173] (port=46774 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N77Tq-0008DL-8J
	for commit-inetutils@gnu.org; Sun, 08 Nov 2009 08:06:54 -0500
Received: from savannah.gnu.org ([199.232.41.3]:37907 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 <INVALID.NOREPLY@gnu.org>)
	id 1N77To-0004le-5M
	for commit-inetutils@gnu.org; Sun, 08 Nov 2009 08:06:53 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N77Tn-0004ua-4T
	for commit-inetutils@gnu.org; Sun, 08 Nov 2009 13:06:51 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N77Tm-0004u4-Ir
	for commit-inetutils@gnu.org; Sun, 08 Nov 2009 13:06:50 +0000
From: "Alfred M. Szmidt" <ams@gnu.org>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9640d7fca3ddf00e8d7bab9eb7cf36fcc3570678
X-Git-Newrev: 090c42d669eff81b62d42e602ed1ad814e0fa882
Message-Id: <E1N77Tm-0004u4-Ir@cvs.savannah.gnu.org>
Date: Sun, 08 Nov 2009 13:06:50 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. release_1_5-218-g090c42d
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: Sun, 08 Nov 2009 13:06:57 -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 ".

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

The branch, master has been updated
       via  090c42d669eff81b62d42e602ed1ad814e0fa882 (commit)
      from  9640d7fca3ddf00e8d7bab9eb7cf36fcc3570678 (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 -----------------------------------------------------------------
commit 090c42d669eff81b62d42e602ed1ad814e0fa882
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Nov 8 13:16:16 2009 +0100

    2009-11-08  Alfred M. Szmidt  <ams@gnu.org>
    
    	* hostname/hostname.c (_hostname_options): Struct renamed to ..
    	(hostname_arguments): ... this.  Updated all references.
    	(parse_opt, main, get_name, set_name): Renamed ARGUMENTS to ARGS.
    	Updated all references.

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

Summary of changes:
 ChangeLog           |    7 ++++
 hostname/hostname.c |   77 +++++++++++++++++++++++++--------------------------
 2 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 27ab872..818f648 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-08  Alfred M. Szmidt  <ams@gnu.org>
+
+	* hostname/hostname.c (_hostname_options): Struct renamed to ..
+	(hostname_arguments): ... this.  Updated all references.
+	(parse_opt, main, get_name, set_name): Renamed ARGUMENTS to ARGS.
+	Updated all references.
+
 2009-10-29  Alfred M. Szmidt  <ams@gnu.org>
 
 	* hostname/hostname.c (argp_options): Fixed typo.
diff --git a/hostname/hostname.c b/hostname/hostname.c
index 5b1c0a0..271ffd1 100644
--- a/hostname/hostname.c
+++ b/hostname/hostname.c
@@ -35,17 +35,16 @@
 #include "xgetdomainname.h"
 
 
-struct _hostname_options
+typedef struct
 {
-    const char *hostname_file;
-    const char *hostname_new;
-    short int hostname_alias;
-    short int hostname_fqdn;
-    short int hostname_ip_address;
-    short int hostname_dns_domain;
-    short int hostname_short;
-};
-typedef struct _hostname_options hostname_options;
+  const char *hostname_file;
+  const char *hostname_new;
+  short int hostname_alias;
+  short int hostname_fqdn;
+  short int hostname_ip_address;
+  short int hostname_dns_domain;
+  short int hostname_short;
+} hostname_arguments;
 
 static char *(*get_name_action) (void) = NULL;
 static int (*set_name_action) (const char *name, size_t size) = NULL;
@@ -75,40 +74,40 @@ static struct argp_option argp_options[] = {
 static error_t
 parse_opt (int key, char *arg, struct argp_state *state)
 {
-  hostname_options *const options = (hostname_options *const) state->input;
+  hostname_arguments *const args = (hostname_arguments *const) state->input;
 
   switch (key)
     {
     case 'a':
       get_name_action = xgethostname;
-      options->hostname_alias = 1;
+      args->hostname_alias = 1;
       break;
 
     case 'd':
       get_name_action = xgethostname;
-      options->hostname_fqdn = 1;
-      options->hostname_dns_domain = 1;
+      args->hostname_fqdn = 1;
+      args->hostname_dns_domain = 1;
       break;
 
     case 'F':
       set_name_action = sethostname;
-      options->hostname_file = arg;
+      args->hostname_file = arg;
       break;
 
     case 'f':
       get_name_action = xgethostname;
-      options->hostname_fqdn = 1;
+      args->hostname_fqdn = 1;
       break;
 
     case 'i':
       get_name_action = xgethostname;
-      options->hostname_ip_address = 1;
+      args->hostname_ip_address = 1;
       break;
 
     case 's':
       get_name_action = xgethostname;
-      options->hostname_fqdn = 1;
-      options->hostname_short = 1;
+      args->hostname_fqdn = 1;
+      args->hostname_short = 1;
       break;
 
     case 'y':
@@ -117,8 +116,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
     case ARGP_KEY_ARG:
       set_name_action = sethostname;
-      options->hostname_new = strdup (arg);
-      if (options->hostname_new == NULL)
+      args->hostname_new = strdup (arg);
+      if (args->hostname_new == NULL)
         error (EXIT_FAILURE, errno, "strdup");
       break;
 
@@ -131,8 +130,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
 static struct argp argp = {argp_options, parse_opt, args_doc, doc};
 
-static void get_name (const hostname_options *const options);
-static void set_name (const hostname_options *const options);
+static void get_name (const hostname_arguments *const args);
+static void set_name (const hostname_arguments *const args);
 static char * get_aliases (const char *const host_name);
 static char * get_fqdn (const char *const host_name);
 static char * get_ip_addresses (const char *const host_name);
@@ -143,30 +142,30 @@ static char * parse_file (const char *const file_name);
 int
 main (int argc, char *argv[])
 {
-  hostname_options options;
+  hostname_arguments args;
 
   set_program_name (argv[0]);
 
-  memset ((void *) &options, 0, sizeof (options));
+  memset ((void *) &args, 0, sizeof (args));
 
   /* Parse command line */
   iu_argp_init ("hostname", program_authors);
-  argp_parse (&argp, argc, argv, 0, NULL, (void *) &options);
+  argp_parse (&argp, argc, argv, 0, NULL, (void *) &args);
 
   /* Set default action */
   if (get_name_action == NULL && set_name_action ==  NULL)
     get_name_action = xgethostname;
 
   if (get_name_action == xgetdomainname || get_name_action == xgethostname)
-    get_name (&options);
+    get_name (&args);
   else if (set_name_action == sethostname)
-    set_name (&options);
+    set_name (&args);
 
   return 0;
 }
 
 static void
-get_name (const hostname_options *const options)
+get_name (const hostname_arguments *const args)
 {
   char *sname, *name;
   int status;
@@ -175,25 +174,25 @@ get_name (const hostname_options *const options)
 
   if (!sname)
     error (EXIT_FAILURE, errno, "cannot determine name");
-  if (options->hostname_alias == 1)
+  if (args->hostname_alias == 1)
     name = get_aliases (sname);
-  else if (options->hostname_fqdn == 1)
+  else if (args->hostname_fqdn == 1)
     {
       name = get_fqdn (sname);
 
-      if (options->hostname_dns_domain == 1 || options->hostname_short == 1)
+      if (args->hostname_dns_domain == 1 || args->hostname_short == 1)
         {
           free (sname);
           sname = name;
           name = NULL;
         }
 
-      if (options->hostname_dns_domain == 1)
+      if (args->hostname_dns_domain == 1)
         name = get_dns_domain_name (sname);
-      else if (options->hostname_short == 1)
+      else if (args->hostname_short == 1)
         name = get_short_hostname (sname);
     }
-  else if (options->hostname_ip_address == 1)
+  else if (args->hostname_ip_address == 1)
       name = get_ip_addresses (sname);
   else
     {
@@ -210,16 +209,16 @@ get_name (const hostname_options *const options)
 }
 
 static void
-set_name (const hostname_options *const options)
+set_name (const hostname_arguments *const args)
 {
   const char *hostname_new;
   int status;
   size_t size;
 
-  if (options->hostname_file != NULL)
-    hostname_new = parse_file (options->hostname_file);
+  if (args->hostname_file != NULL)
+    hostname_new = parse_file (args->hostname_file);
   else
-    hostname_new = options->hostname_new;
+    hostname_new = args->hostname_new;
 
   size = strlen (hostname_new);
   status = (*set_name_action) (hostname_new, size);


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Wed Nov 11 13:23:52 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N8HrD-0001cf-Qq
	for mharc-commit-inetutils@gnu.org; Wed, 11 Nov 2009 13:23:51 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N8HrB-0001ZE-Gu
	for commit-inetutils@gnu.org; Wed, 11 Nov 2009 13:23:49 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N8HrA-0001Xs-Kw
	for commit-inetutils@gnu.org; Wed, 11 Nov 2009 13:23:48 -0500
Received: from [199.232.76.173] (port=50147 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N8HrA-0001XW-Cp
	for commit-inetutils@gnu.org; Wed, 11 Nov 2009 13:23:48 -0500
Received: from savannah.gnu.org ([199.232.41.3]:58862 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 <INVALID.NOREPLY@gnu.org>)
	id 1N8HrA-0002Mm-3U
	for commit-inetutils@gnu.org; Wed, 11 Nov 2009 13:23:48 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N8Hr8-00022s-Vf
	for commit-inetutils@gnu.org; Wed, 11 Nov 2009 18:23:47 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N8Hr8-00022K-LV
	for commit-inetutils@gnu.org; Wed, 11 Nov 2009 18:23:46 +0000
From: "Alfred M. Szmidt" <ams@gnu.org>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 090c42d669eff81b62d42e602ed1ad814e0fa882
X-Git-Newrev: d6848fcc4af10e83a70712415bb1a487a56899af
Message-Id: <E1N8Hr8-00022K-LV@cvs.savannah.gnu.org>
Date: Wed, 11 Nov 2009 18:23:46 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. release_1_5-219-gd6848fc
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, 11 Nov 2009 18:23:49 -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 ".

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

The branch, master has been updated
       via  d6848fcc4af10e83a70712415bb1a487a56899af (commit)
      from  090c42d669eff81b62d42e602ed1ad814e0fa882 (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 -----------------------------------------------------------------
commit d6848fcc4af10e83a70712415bb1a487a56899af
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Nov 10 17:00:07 2009 +0100

    Updated.  (silent change)

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

Summary of changes:
 TODO |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index 2e13231..6081a4e 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,10 @@ 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.
 
-Add autoconf check for bison.
+tftp does not work with IPv6.
+
+Add a better autoconf check for bison, it will succeed even though the
+generated files do not exist.
 
 Go through code and check what is clean, needs cleaning, etc.
 
@@ -19,7 +22,7 @@ infrastructure for things.  Ben Asselstine might have ideas with his
 argp hacks...  Good candidate for this are rsh/rshd rlogin/rlogind,
 rcp (simple protocol, and simple programs).
 
-Add debugging output for client/daemon, example of output:
+Add debugging output for client/daemon, suggested example of output:
 FROM-HOST -->: Received message
 <-- TO-HOST: Sent message
 <-- TO-HOST: Sent message
@@ -106,8 +109,8 @@ Ability to ping multiple host in one go.
 
 ** Some systems can provide more interfaces than
   SIOCGIFCONF/if_nameindex, interfaces which are usually not UP but
-  registered nevertheless.
-  (linux: /prov/net/dev). Some support for that?
+  registered nevertheless.  (linux: /prov/net/dev). Some support for
+  that?
 
 ** Honour IFF_CANTCHANGE when working in flag setting in brdaddr,
   dstaddr, etc.
@@ -127,8 +130,8 @@ What about rwhois?
 
 Should support the refer attribute of RIPE-189 objects.
 
-I need a procedure for looking up an IPv6 address in a list of prefixes.
-Will anybody contribute it?
+I need a procedure for looking up an IPv6 address in a list of
+prefixes.  Will anybody contribute it?
 
 Add Exodus rwhois server (e.g. 216.35.0.0/16).
 


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Thu Nov 12 16:29:07 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N8hE3-0003NS-7O
	for mharc-commit-inetutils@gnu.org; Thu, 12 Nov 2009 16:29:07 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N8hE0-0003Lv-WA
	for commit-inetutils@gnu.org; Thu, 12 Nov 2009 16:29:05 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N8hE0-0003LD-0Q
	for commit-inetutils@gnu.org; Thu, 12 Nov 2009 16:29:04 -0500
Received: from [199.232.76.173] (port=38516 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N8hDz-0003L5-O3
	for commit-inetutils@gnu.org; Thu, 12 Nov 2009 16:29:03 -0500
Received: from savannah.gnu.org ([199.232.41.3]:34401 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 <INVALID.NOREPLY@gnu.org>)
	id 1N8hDz-0004mN-FW
	for commit-inetutils@gnu.org; Thu, 12 Nov 2009 16:29:03 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N8hDz-0006Xg-1s
	for commit-inetutils@gnu.org; Thu, 12 Nov 2009 21:29:03 +0000
Received: from jas by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N8hDy-0006XA-PN
	for commit-inetutils@gnu.org; Thu, 12 Nov 2009 21:29:03 +0000
From: "Simon Josefsson" <simon@josefsson.org>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d6848fcc4af10e83a70712415bb1a487a56899af
X-Git-Newrev: d3080c58a18f3f10f3e3372eb6f3ca5f1032dda7
Message-Id: <E1N8hDy-0006XA-PN@cvs.savannah.gnu.org>
Date: Thu, 12 Nov 2009 21:29:02 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. release_1_5-220-gd3080c5
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, 12 Nov 2009 21:29:05 -0000

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

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

The branch, master has been updated
       via  d3080c58a18f3f10f3e3372eb6f3ca5f1032dda7 (commit)
      from  d6848fcc4af10e83a70712415bb1a487a56899af (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 -----------------------------------------------------------------
commit d3080c58a18f3f10f3e3372eb6f3ca5f1032dda7
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu Nov 12 22:28:43 2009 +0100

    Add coverage related rules.

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

Summary of changes:
 ChangeLog                      |    6 ++++++
 bootstrap.conf                 |    1 +
 hostname/Makefile.am => cfg.mk |   16 ++++++++--------
 3 files changed, 15 insertions(+), 8 deletions(-)
 copy hostname/Makefile.am => cfg.mk (71%)

diff --git a/ChangeLog b/ChangeLog
index 818f648..8b73928 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-12  Simon Josefsson  <simon@josefsson.org>
+
+	* bootstrap.conf (gnulib_modules): Add maintainer-makefile, to get
+	coverage generating rules.
+	* cfg.mk: New file, with coverage uploading rules.
+
 2009-11-08  Alfred M. Szmidt  <ams@gnu.org>
 
 	* hostname/hostname.c (_hostname_options): Struct renamed to ..
diff --git a/bootstrap.conf b/bootstrap.conf
index e219ac1..1586115 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -42,6 +42,7 @@ gettext-h
 getusershell
 glob
 inttostr
+maintainer-makefile
 malloc
 mempcpy
 minmax
diff --git a/hostname/Makefile.am b/cfg.mk
similarity index 71%
copy from hostname/Makefile.am
copy to cfg.mk
index c7d78f8..6cfdbb9 100644
--- a/hostname/Makefile.am
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
@@ -16,12 +16,12 @@
 # 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@
+htmldir = ../www-$(PACKAGE)
 
-EXTRA_PROGRAMS = hostname
+web-coverage:
+	rm -fv `find $(htmldir)/coverage -type f | grep -v CVS`
+	cp -rv doc/coverage/* $(htmldir)/coverage/
 
-hostname_SOURCES = hostname.c
-
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/libinetutils
-
-LDADD = -L$(top_builddir)/lib -lgnu
+upload-web-coverage:
+	cd $(htmldir) && \
+		cvs commit -m "Update." coverage


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Fri Nov 13 12:07:04 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N8zbz-0001Wh-RF
	for mharc-commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:07:03 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N8zby-0001VI-91
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:07:02 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N8zbx-0001UU-I2
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:07:01 -0500
Received: from [199.232.76.173] (port=43923 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N8zbx-0001UG-CN
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:07:01 -0500
Received: from savannah.gnu.org ([199.232.41.3]:57349 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 <INVALID.NOREPLY@gnu.org>)
	id 1N8zbw-000393-UY
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:07:01 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N8zbw-0004LI-3a
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 17:07:00 +0000
Received: from jas by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N8zbv-0004Km-Qp
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 17:07:00 +0000
From: "Simon Josefsson" <simon@josefsson.org>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d3080c58a18f3f10f3e3372eb6f3ca5f1032dda7
X-Git-Newrev: c198e79fa1b398c1f05a85d1d99314b63f05a10d
Message-Id: <E1N8zbv-0004Km-Qp@cvs.savannah.gnu.org>
Date: Fri, 13 Nov 2009 17: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. release_1_5-221-gc198e79
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, 13 Nov 2009 17:07:02 -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 ".

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

The branch, master has been updated
       via  c198e79fa1b398c1f05a85d1d99314b63f05a10d (commit)
      from  d3080c58a18f3f10f3e3372eb6f3ca5f1032dda7 (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 -----------------------------------------------------------------
commit c198e79fa1b398c1f05a85d1d99314b63f05a10d
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Nov 13 18:06:53 2009 +0100

    Fix syntax-check sc_cast_of_argument_to_free.

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

Summary of changes:
 ChangeLog           |    6 ++++++
 hostname/hostname.c |    2 +-
 inetd/inetd.c       |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b73928..782221e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-13  Simon Josefsson  <simon@josefsson.org>
+
+	* inetd/inetd.c (nextconfig): Fix syntax-check
+	sc_cast_of_argument_to_free.
+	* hostname/hostname.c (set_name): Likewise.
+
 2009-11-12  Simon Josefsson  <simon@josefsson.org>
 
 	* bootstrap.conf (gnulib_modules): Add maintainer-makefile, to get
diff --git a/hostname/hostname.c b/hostname/hostname.c
index 271ffd1..9f399f3 100644
--- a/hostname/hostname.c
+++ b/hostname/hostname.c
@@ -225,7 +225,7 @@ set_name (const hostname_arguments *const args)
   if (status == -1)
     error (EXIT_FAILURE, errno, "sethostname");
 
-  free ((void *) hostname_new);
+  free (hostname_new);
   return;
 }
 
diff --git a/inetd/inetd.c b/inetd/inetd.c
index f4637c9..0b6d6d9 100644
--- a/inetd/inetd.c
+++ b/inetd/inetd.c
@@ -1305,7 +1305,7 @@ nextconfig (const char *file)
       if (debug)
 	print_service ("FREE", sep);
       freeconfig (sep);
-      free ((char *) sep);
+      free (sep);
     }
   signal_unblock (&sigstatus);
 }


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Fri Nov 13 12:27:28 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N8zvk-000555-9R
	for mharc-commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:27:28 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N8zvj-00054s-2A
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:27:27 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N8zvi-00054g-Dc
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:27:26 -0500
Received: from [199.232.76.173] (port=37007 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N8zvi-00054d-77
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:27:26 -0500
Received: from savannah.gnu.org ([199.232.41.3]:49768 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 <INVALID.NOREPLY@gnu.org>)
	id 1N8zvh-0006sD-V0
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:27:26 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N8zvh-0005U1-7r
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 17:27:25 +0000
Received: from jas by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N8zvg-0005TV-B6
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 17:27:25 +0000
From: "Simon Josefsson" <simon@josefsson.org>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c198e79fa1b398c1f05a85d1d99314b63f05a10d
X-Git-Newrev: 315907c800aa606f747ecf82fb04ff36b03a993a
Message-Id: <E1N8zvg-0005TV-B6@cvs.savannah.gnu.org>
Date: Fri, 13 Nov 2009 17:27:24 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. release_1_5-222-g315907c
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, 13 Nov 2009 17:27:27 -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 ".

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

The branch, master has been updated
       via  315907c800aa606f747ecf82fb04ff36b03a993a (commit)
      from  c198e79fa1b398c1f05a85d1d99314b63f05a10d (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 -----------------------------------------------------------------
commit 315907c800aa606f747ecf82fb04ff36b03a993a
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Nov 13 18:27:15 2009 +0100

    Fix syntax-check sc_cast_of_alloca_return_value.

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

Summary of changes:
 ChangeLog   |    6 ++++++
 ftpd/ftpd.c |    3 +--
 rshd/rshd.c |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 782221e..9a034c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-11-13  Simon Josefsson  <simon@josefsson.org>
 
+	* rshd/rshd.c (doit): Fix syntax-check
+	sc_cast_of_alloca_return_value.
+	* ftpd/ftpd.c (send_file_list): Likewise.
+
+2009-11-13  Simon Josefsson  <simon@josefsson.org>
+
 	* inetd/inetd.c (nextconfig): Fix syntax-check
 	sc_cast_of_argument_to_free.
 	* hostname/hostname.c (set_name): Likewise.
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 38e23c4..3a7772d 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -1942,8 +1942,7 @@ send_file_list (const char *whichf)
 	      dir->d_name[2] == '\0')
 	    continue;
 
-	  nbuf = (char *) alloca (strlen (dirname) + 1 +
-				  strlen (dir->d_name) + 1);
+	  nbuf = alloca (strlen (dirname) + 1 + strlen (dir->d_name) + 1);
 	  sprintf (nbuf, "%s/%s", dirname, dir->d_name);
 
 	  /* We have to do a stat to insure it's
diff --git a/rshd/rshd.c b/rshd/rshd.c
index 38bc10b..c966e44 100644
--- a/rshd/rshd.c
+++ b/rshd/rshd.c
@@ -507,7 +507,7 @@ doit (int sockfd, struct sockaddr_in *fromp)
 #endif
 	if (check_all || local_domain (hp->h_name))
 	  {
-	    char *remotehost = (char *) alloca (strlen (hostname) + 1);
+	    char *remotehost = alloca (strlen (hostname) + 1);
 	    if (!remotehost)
 	      errorstr = "Out of memory\n";
 	    else


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Fri Nov 13 12:44:02 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N90Bm-0006QY-DX
	for mharc-commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:44:02 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N90Bl-0006QD-Co
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:44:01 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N90Bk-0006Pt-1l
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:44:00 -0500
Received: from [199.232.76.173] (port=42263 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N90Bj-0006Pq-Qr
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:43:59 -0500
Received: from savannah.gnu.org ([199.232.41.3]:60508 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 <INVALID.NOREPLY@gnu.org>)
	id 1N90Bi-0000rP-Va
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 12:43:59 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N90Bi-0006Nu-8Z
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 17:43:58 +0000
Received: from jas by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N90Bh-0006NL-Po
	for commit-inetutils@gnu.org; Fri, 13 Nov 2009 17:43:58 +0000
From: "Simon Josefsson" <simon@josefsson.org>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 315907c800aa606f747ecf82fb04ff36b03a993a
X-Git-Newrev: e1cc9b2ef35660642ea5a89ff8dfaeee31d2b612
Message-Id: <E1N90Bh-0006NL-Po@cvs.savannah.gnu.org>
Date: Fri, 13 Nov 2009 17:43:57 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. release_1_5-223-ge1cc9b2
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, 13 Nov 2009 17:44:01 -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 ".

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

The branch, master has been updated
       via  e1cc9b2ef35660642ea5a89ff8dfaeee31d2b612 (commit)
      from  315907c800aa606f747ecf82fb04ff36b03a993a (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 -----------------------------------------------------------------
commit e1cc9b2ef35660642ea5a89ff8dfaeee31d2b612
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Nov 13 18:43:49 2009 +0100

    Fix syntax-check sc_cast_of_x_alloc_return_value.

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

Summary of changes:
 ChangeLog           |    7 +++++++
 hostname/hostname.c |    4 ++--
 ping/ping_common.c  |    2 +-
 rsh/rsh.c           |    2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a034c6..7b78e9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-11-13  Simon Josefsson  <simon@josefsson.org>
 
+	* hostname/hostname.c (get_aliases, get_ip_addresses): Fix
+	syntax-check sc_cast_of_x_alloc_return_value.
+	* ping/ping_common.c (init_data_buffer): Likewise.
+	* rsh/rsh.c (main): Likewise.
+
+2009-11-13  Simon Josefsson  <simon@josefsson.org>
+
 	* rshd/rshd.c (doit): Fix syntax-check
 	sc_cast_of_alloca_return_value.
 	* ftpd/ftpd.c (send_file_list): Likewise.
diff --git a/hostname/hostname.c b/hostname/hostname.c
index 9f399f3..875bc11 100644
--- a/hostname/hostname.c
+++ b/hostname/hostname.c
@@ -238,7 +238,7 @@ get_aliases (const char *const host_name)
   unsigned int size = 256;
   struct hostent *ht;
 
-  aliases = (char *) xmalloc (sizeof (char) * size);
+  aliases = xmalloc (sizeof (char) * size);
   aliases[0] = '\0';
 
   ht = gethostbyname (host_name);
@@ -294,7 +294,7 @@ get_ip_addresses (const char *const host_name)
   unsigned int size = 256;
   struct hostent *ht;
 
-  addresses = (char *) xmalloc (sizeof (char) * size);
+  addresses = xmalloc (sizeof (char) * size);
   addresses[0] = '\0';
 
   ht = gethostbyname (host_name);
diff --git a/ping/ping_common.c b/ping/ping_common.c
index 7021c4e..4206d52 100644
--- a/ping/ping_common.c
+++ b/ping/ping_common.c
@@ -64,7 +64,7 @@ init_data_buffer (u_char * pat, int len)
   if (data_length == 0)
     return;
 
-  data_buffer = (u_char *) xmalloc (data_length);
+  data_buffer = xmalloc (data_length);
 
   if (pat)
     {
diff --git a/rsh/rsh.c b/rsh/rsh.c
index cc36cc1..5ee5c61 100644
--- a/rsh/rsh.c
+++ b/rsh/rsh.c
@@ -362,7 +362,7 @@ try_connect:
 	  int i;
 	  char *term;
 
-	  term = (char *) xmalloc (strlen (args) + 4);
+	  term = xmalloc (strlen (args) + 4);
 	  strcpy (term, "-x ");
 	  strcat (term, args);
 


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sat Nov 14 05:55:48 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9GIG-00086V-Ef
	for mharc-commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:55:48 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9GIE-00085W-8V
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:55:46 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9GID-00084q-HW
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:55:45 -0500
Received: from [199.232.76.173] (port=51429 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9GID-00084W-9d
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:55:45 -0500
Received: from savannah.gnu.org ([199.232.41.3]:60742 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 <INVALID.NOREPLY@gnu.org>)
	id 1N9GIC-0002ua-Qk
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:55:45 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GIC-0001jD-2J
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 10:55:44 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GIB-0001ic-Ms
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 10:55:44 +0000
From: "Alfred M. Szmidt" <ams@gnu.org>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e1cc9b2ef35660642ea5a89ff8dfaeee31d2b612
X-Git-Newrev: d72aac571d49307228b2a4498c00098889c23cfb
Message-Id: <E1N9GIB-0001ic-Ms@cvs.savannah.gnu.org>
Date: Sat, 14 Nov 2009 10:55:43 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Inetutils  branch, master,
	updated. release_1_5-229-gd72aac5
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, 14 Nov 2009 10:55: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 ".

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

The branch, master has been updated
       via  d72aac571d49307228b2a4498c00098889c23cfb (commit)
       via  21ed96b40318f1622466ad2ee82aa484b0648342 (commit)
       via  cb9b4fdcbb60c3d34028aa7256fac6ada520b621 (commit)
       via  dc8800d837877e17adff99e9c64f6bcf3206ad3c (commit)
       via  fc8aaa5800076187b85f544e6d1fb92faafa1aad (commit)
       via  5460401a29a6c9286e906f22c5141b410ea52494 (commit)
      from  e1cc9b2ef35660642ea5a89ff8dfaeee31d2b612 (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 -----------------------------------------------------------------
commit d72aac571d49307228b2a4498c00098889c23cfb
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 14 11:57:00 2009 +0100

    .gitignore (GNUmakefile, bootstrap.conf): Added new ignore rules.

commit 21ed96b40318f1622466ad2ee82aa484b0648342
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 14 11:55:07 2009 +0100

    Added dirname-lgpl module from gnulib.

commit cb9b4fdcbb60c3d34028aa7256fac6ada520b621
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 14 11:53:59 2009 +0100

    Added test two test cases (one for ping, one for traceroute).

commit dc8800d837877e17adff99e9c64f6bcf3206ad3c
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 14 11:52:27 2009 +0100

    .gitignore (*.gcno, *.gcda, *.gcov, inetutils-*/)
    (inetutils-*.tar.gz): Added new ignore rules.

commit fc8aaa5800076187b85f544e6d1fb92faafa1aad
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 14 11:47:12 2009 +0100

    whois/whois.h, rsh/rsh.c (usage): Removed prototype.

commit 5460401a29a6c9286e906f22c5141b410ea52494
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 14 11:46:17 2009 +0100

    Updated.  (silent change)

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

Summary of changes:
 .gitignore                    |   11 +++++++++--
 ChangeLog                     |   28 ++++++++++++++++++++++++++++
 TODO                          |    6 ++++++
 bootstrap.conf                |    3 ++-
 lib/.gitignore                |    2 ++
 rsh/rsh.c                     |   10 +---------
 tests/Makefile.am             |    2 +-
 tests/ping-localhost.sh       |   15 +++++++++++++++
 tests/traceroute-localhost.sh |   15 +++++++++++++++
 whois/whois.h                 |    1 -
 10 files changed, 79 insertions(+), 14 deletions(-)
 create mode 100644 tests/ping-localhost.sh
 create mode 100644 tests/traceroute-localhost.sh

diff --git a/.gitignore b/.gitignore
index 81fd269..5c5c115 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,23 @@
 *.a
 *.cflow
+*.gcda
+*.gcno
+*.gcov
 *.la
 *.lo
 *.o
 *.so
 *~
-TAGS
 .bootstrap
 .deps
 .emacs*
 .libs
 ABOUT-NLS
+GNUmakefile
 INSTALL
 Makefile
 Makefile.in
+TAGS
 aclocal.m4
 autom4te.cache
 build-aux
@@ -26,9 +30,12 @@ config.status
 configure
 confpaths.h
 include
+inetutils-*.tar.gz
+inetutils-*/
 libtool
 m4
+maint.mk
 pathdefs.make
 paths.defs
 stamp-h.in
-stamp-h1
+stamp-h1
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index 7b78e9a..487e38b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
+
+	* .gitignore (GNUmakefile, bootstrap.conf): Added new ignore
+	rules.
+
+2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
+
+	* bootstrap.conf (gnulib_modules): Added dirname-lgpl.
+	(lib/.gitignore): Updated by ./bootstrap.
+
+2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
+
+	* tests/Makefile.am (TESTS): Added ping-localhost.sh and
+	traceroute-localhost.sh.  Use $(check_PROGRAMS) instead of
+	specifying all C test cases manually.
+
+	* tests/traceroute-localhost.sh, tests/ping-localhost.sh: New
+	file.
+
+2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
+
+	* .gitignore (*.gcno, *.gcda, *.gcov, inetutils-*/)
+	(inetutils-*.tar.gz): Added new ignore rules.
+
+2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
+
+	* whois/whois.h, rsh/rsh.c (usage): Removed prototype.
+
 2009-11-13  Simon Josefsson  <simon@josefsson.org>
 
 	* hostname/hostname.c (get_aliases, get_ip_addresses): Fix
diff --git a/TODO b/TODO
index 6081a4e..44f3569 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,11 @@
 * General
 
+Add framework for tests.
+
+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,
diff --git a/bootstrap.conf b/bootstrap.conf
index 1586115..996252c 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -27,6 +27,7 @@ argp
 argp-version-etc
 autobuild
 dirfd
+dirname-lgpl
 error
 exit
 exitfail
@@ -72,8 +73,8 @@ vsnprintf
 xalloc
 xalloc-die
 xgetcwd
-xgethostname
 xgetdomainname
+xgethostname
 xsize
 "
 
diff --git a/lib/.gitignore b/lib/.gitignore
index d7efcc0..42b0fa1 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -19,6 +19,7 @@ argp-xinl.c
 argp.h
 asnprintf.c
 at-func.c
+basename-lgpl.c
 basename.c
 btowc.c
 canonicalize-lgpl.c
@@ -36,6 +37,7 @@ creat-safer.c
 dirent.h
 dirent.in.h
 dirfd.c
+dirname-lgpl.c
 dirname.c
 dirname.h
 dup-safer.c
diff --git a/rsh/rsh.c b/rsh/rsh.c
index 5ee5c61..65e97f2 100644
--- a/rsh/rsh.c
+++ b/rsh/rsh.c
@@ -128,7 +128,6 @@ int rfd2;
 char *copyargs (char **);
 RETSIGTYPE sendsig (int);
 void talk (int, sigset_t *, pid_t, int);
-void usage (void);
 void warning (const char *, ...);
 
 
@@ -209,16 +208,9 @@ parse_opt (int key, char *arg, struct argp_state *state)
   return 0;
 }
 
-static struct argp argp =
-  {
-    options,
-    parse_opt,
-    args_doc,
-    doc
-  };
+static struct argp argp = { options, parse_opt, args_doc, doc };
 
 
-
 int
 main (int argc, char **argv)
 {
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cf615df..4adf3f0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,5 +20,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib
 
 LDADD = -L../libinetutils -linetutils
 
-TESTS = localhost
 check_PROGRAMS = localhost
+TESTS = $(check_PROGRAMS) ping-localhost.sh traceroute-localhost.sh
diff --git a/tests/ping-localhost.sh b/tests/ping-localhost.sh
new file mode 100644
index 0000000..4be2a02
--- /dev/null
+++ b/tests/ping-localhost.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ $VERBOSE ]; then
+    set -x
+    ping --version
+fi
+
+if [ `id -u` != 0 ]; then
+    echo "ping needs to run as root"
+    exit 77
+fi
+
+ping -c 1 127.0.0.1; errno=$?
+
+exit $errno
diff --git a/tests/traceroute-localhost.sh b/tests/traceroute-localhost.sh
new file mode 100644
index 0000000..79f2cc6
--- /dev/null
+++ b/tests/traceroute-localhost.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ $VERBOSE ]; then
+    set -x
+    traceroute --version
+fi
+
+if [ `id -u` != 0 ]; then
+    echo "traceroute needs to run as root"
+    exit 77
+fi
+
+traceroute 127.0.0.1; errno=$?
+
+exit $errno
diff --git a/whois/whois.h b/whois/whois.h
index 172c1da..2fa4571 100644
--- a/whois/whois.h
+++ b/whois/whois.h
@@ -61,7 +61,6 @@ void do_query (const int, const char *);
 const char *query_crsnic (const int, const char *);
 int openconn (const char *, const char *);
 void closeconn (const int);
-void usage (void);
 RETSIGTYPE sighandler (int);
 unsigned long myinet_aton (const char *);
 int domcmp (const char *, const char *);


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sat Nov 14 06:08:28 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9GUW-0002xh-7G
	for mharc-commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:08:28 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9GUT-0002ws-IP
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:08:25 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9GUS-0002wY-4u
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:08:24 -0500
Received: from [199.232.76.173] (port=41914 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9GUR-0002wV-82
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:08:23 -0500
Received: from savannah.gnu.org ([199.232.41.3]:48992 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 <INVALID.NOREPLY@gnu.org>)
	id 1N9GUQ-0004dI-SX
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:08:22 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GUQ-0002Y0-2Z
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:08:22 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GUP-0002XU-RX
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:08:22 +0000
From: "Alfred M. Szmidt" <ams@gnu.org>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d72aac571d49307228b2a4498c00098889c23cfb
X-Git-Newrev: 53f365051a515cb125071990639f601c0b52798c
Message-Id: <E1N9GUP-0002XU-RX@cvs.savannah.gnu.org>
Date: Sat, 14 Nov 2009 11:08:21 +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_6-85-g53f3650
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, 14 Nov 2009 11:08:26 -0000

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

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

The branch, master has been updated
       via  53f365051a515cb125071990639f601c0b52798c (commit)
      from  d72aac571d49307228b2a4498c00098889c23cfb (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 -----------------------------------------------------------------
commit 53f365051a515cb125071990639f601c0b52798c
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 14 12:14:05 2009 +0100

    Fix permissions.  (silent change)

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

Summary of changes:
 0 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 tests/ping-localhost.sh
 mode change 100644 => 100755 tests/traceroute-localhost.sh

diff --git a/tests/ping-localhost.sh b/tests/ping-localhost.sh
old mode 100644
new mode 100755
diff --git a/tests/traceroute-localhost.sh b/tests/traceroute-localhost.sh
old mode 100644
new mode 100755


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sat Nov 14 06:20:39 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9GgI-00060t-Uc
	for mharc-commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:20:39 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9GgG-00060e-TV
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:20:36 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9GgE-00060C-3l
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:20:34 -0500
Received: from [199.232.76.173] (port=57606 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9GgD-000609-T5
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:20:33 -0500
Received: from savannah.gnu.org ([199.232.41.3]:45327 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 <INVALID.NOREPLY@gnu.org>)
	id 1N9GgD-0006VH-Md
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:20:33 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GgB-0003bJ-VP
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:20:32 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9Gg5-0003ZR-EY
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:20:28 +0000
From: "Alfred M. Szmidt" <ams@gnu.org>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 53f365051a515cb125071990639f601c0b52798c
X-Git-Newrev: db2f7fbf37c69215a3ea8d7e610e0ad0ca06c7a4
Message-Id: <E1N9Gg5-0003ZR-EY@cvs.savannah.gnu.org>
Date: Sat, 14 Nov 2009 11:20:25 +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_6-86-gdb2f7fb
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, 14 Nov 2009 11:20:37 -0000

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

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

The branch, master has been updated
       via  db2f7fbf37c69215a3ea8d7e610e0ad0ca06c7a4 (commit)
      from  53f365051a515cb125071990639f601c0b52798c (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 -----------------------------------------------------------------
commit db2f7fbf37c69215a3ea8d7e610e0ad0ca06c7a4
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 14 12:26:09 2009 +0100

    bootstrap.conf (gnulib_modules): Added gnupload.

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

Summary of changes:
 ChangeLog      |    4 ++++
 bootstrap.conf |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 487e38b..386ef50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
 
+	* bootstrap.conf (gnulib_modules): Added gnupload.
+
+2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
+
 	* .gitignore (GNUmakefile, bootstrap.conf): Added new ignore
 	rules.
 
diff --git a/bootstrap.conf b/bootstrap.conf
index 996252c..37377a5 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -42,6 +42,7 @@ gettext
 gettext-h
 getusershell
 glob
+gnupload
 inttostr
 maintainer-makefile
 malloc


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sat Nov 14 08:36:28 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9Ink-0004TJ-5M
	for mharc-commit-inetutils@gnu.org; Sat, 14 Nov 2009 08:36:28 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9Ini-0004Sf-HN
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 08:36:26 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9Inh-0004ST-Kv
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 08:36:26 -0500
Received: from [199.232.76.173] (port=39703 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9Inh-0004SQ-I5
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 08:36:25 -0500
Received: from savannah.gnu.org ([199.232.41.3]:47207 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 <INVALID.NOREPLY@gnu.org>)
	id 1N9Ing-0002k7-Vq
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 08:36:25 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9Ine-0002GI-9A
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 13:36:22 +0000
Received: from jas by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9Ind-0002Fl-UT
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 13:36:22 +0000
From: "Simon Josefsson" <simon@josefsson.org>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: db2f7fbf37c69215a3ea8d7e610e0ad0ca06c7a4
X-Git-Newrev: e76fbeb29040682fafd5877ee739099c2b3f975f
Message-Id: <E1N9Ind-0002Fl-UT@cvs.savannah.gnu.org>
Date: Sat, 14 Nov 2009 13:36:21 +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_6-87-ge76fbeb
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, 14 Nov 2009 13:36:26 -0000

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

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

The branch, master has been updated
       via  e76fbeb29040682fafd5877ee739099c2b3f975f (commit)
      from  db2f7fbf37c69215a3ea8d7e610e0ad0ca06c7a4 (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 -----------------------------------------------------------------
commit e76fbeb29040682fafd5877ee739099c2b3f975f
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Nov 14 14:36:17 2009 +0100

    Don't include getopt.h without using it.

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

Summary of changes:
 ChangeLog          |   15 +++++++++++++++
 ftpd/ftpd.c        |    1 -
 ifconfig/options.c |    1 -
 rcp/rcp.c          |    1 -
 rexecd/rexecd.c    |    1 -
 rlogind/rlogind.c  |    1 -
 rshd/rshd.c        |    1 -
 talk/talk.c        |    1 -
 telnet/main.c      |    1 -
 telnetd/telnetd.c  |    2 --
 tftpd/tftpd.c      |    1 -
 uucpd/uucpd.c      |    1 -
 whois/whois.c      |    1 -
 13 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 386ef50..0e67776 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2009-11-14  Simon Josefsson  <simon@josefsson.org>
+
+	* ftpd/ftpd.c: Don't include getopt.h without using it.
+	* whois/whois.c: Likewise.
+	* uucpd/uucpd.c: Likewise.
+	* tftpd/tftpd.c: Likewise.
+	* telnetd/telnetd.c: Likewise.
+	* telnet/main.c: Likewise.
+	* talk/talk.c: Likewise.
+	* rshd/rshd.c: Likewise.
+	* rlogind/rlogind.c: Likewise.
+	* rexecd/rexecd.c: Likewise.
+	* rcp/rcp.c: Likewise.
+	* ifconfig/options.c: Likewise.
+
 2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
 
 	* bootstrap.conf (gnulib_modules): Added gnupload.
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 3a7772d..756a118 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -81,7 +81,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <getopt.h>
 #include <limits.h>
 #include <netdb.h>
 #include <setjmp.h>
diff --git a/ifconfig/options.c b/ifconfig/options.c
index 05a2d41..82401fd 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -23,7 +23,6 @@
 # include <config.h>
 #endif
 
-#include <getopt.h>
 #include <stdio.h>
 #include <errno.h>
 
diff --git a/rcp/rcp.c b/rcp/rcp.c
index f8af146..e838b5e 100644
--- a/rcp/rcp.c
+++ b/rcp/rcp.c
@@ -86,7 +86,6 @@
 #include <string.h>
 #include <string.h>
 #include <unistd.h>
-#include <getopt.h>
 #ifndef HAVE_UTIMES
 # include <utime.h>		/* If we don't have utimes(), use utime(). */
 #endif
diff --git a/rexecd/rexecd.c b/rexecd/rexecd.c
index a1dd6a8..0637dbf 100644
--- a/rexecd/rexecd.c
+++ b/rexecd/rexecd.c
@@ -83,7 +83,6 @@
 #ifdef HAVE_CRYPT_H
 # include <crypt.h>
 #endif
-#include <getopt.h>
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif
diff --git a/rlogind/rlogind.c b/rlogind/rlogind.c
index 1713572..a58c53d 100644
--- a/rlogind/rlogind.c
+++ b/rlogind/rlogind.c
@@ -70,7 +70,6 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
-#include <getopt.h>
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif
diff --git a/rshd/rshd.c b/rshd/rshd.c
index c966e44..f9d819e 100644
--- a/rshd/rshd.c
+++ b/rshd/rshd.c
@@ -109,7 +109,6 @@ char *alloca ();
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <getopt.h>
 #include <grp.h>
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
diff --git a/talk/talk.c b/talk/talk.c
index 50e77f3..0c942e7 100644
--- a/talk/talk.c
+++ b/talk/talk.c
@@ -49,7 +49,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include <getopt.h>
 #include <stdlib.h>
 
 #include "talk.h"
diff --git a/telnet/main.c b/telnet/main.c
index fd2dddf..ad12548 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -52,7 +52,6 @@
 
 #include <sys/types.h>
 
-#include <getopt.h>
 #include <stdlib.h>
 
 #include "ring.h"
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 1b840da..71a7023 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -20,8 +20,6 @@
 
 #include "telnetd.h"
 
-#include <getopt.h>
-
 #ifdef HAVE_SYS_UTSNAME_H
 # include <sys/utsname.h>
 #endif
diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c
index 62258ec..fdf1a23 100644
--- a/tftpd/tftpd.c
+++ b/tftpd/tftpd.c
@@ -72,7 +72,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <getopt.h>
 #include <netdb.h>
 #include <setjmp.h>
 #include <signal.h>
diff --git a/uucpd/uucpd.c b/uucpd/uucpd.c
index 980614e..34f833b 100644
--- a/uucpd/uucpd.c
+++ b/uucpd/uucpd.c
@@ -80,7 +80,6 @@
 #  include <time.h>
 # endif
 #endif
-#include <getopt.h>
 #include <pwd.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/whois/whois.c b/whois/whois.c
index 4c22793..946f613 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <getopt.h>
 #include <unistd.h>
 #include <string.h>
 #include <ctype.h>


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sat Nov 14 09:28:32 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9Jc8-0000d0-84
	for mharc-commit-inetutils@gnu.org; Sat, 14 Nov 2009 09:28:32 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9Jc6-0000bK-8X
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 09:28:30 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9Jc4-0000Zr-DA
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 09:28:29 -0500
Received: from [199.232.76.173] (port=59730 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9Jc4-0000Zf-9T
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 09:28:28 -0500
Received: from savannah.gnu.org ([199.232.41.3]:58145 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 1N9Jc3-0001ja-KT
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 09:28:28 -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 1N9Jc2-0005DC-NK
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 14:28:26 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <ams@savannah.gnu.org>) id 1N9Jc2-0005Cb-9U
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 14:28:26 +0000
From: "Alfred M. Szmidt" <ams@gnu.org>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e76fbeb29040682fafd5877ee739099c2b3f975f
X-Git-Newrev: b033f20780fde4507c77a9c4ac6c23c780cc3609
Message-Id: <E1N9Jc2-0005Cb-9U@cvs.savannah.gnu.org>
Date: Sat, 14 Nov 2009 14:28:26 +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_6-89-gb033f20
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, 14 Nov 2009 14:28:30 -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  b033f20780fde4507c77a9c4ac6c23c780cc3609 (commit)
       via  e6a7989e35d591be6eca0f73cdc66bdda6724dc4 (commit)
      from  e76fbeb29040682fafd5877ee739099c2b3f975f (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=b033f20780fde4507c77a9c4ac6c23c780cc3609


commit b033f20780fde4507c77a9c4ac6c23c780cc3609
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 14 15:34:06 2009 +0100

    Fix syntax-check sc_avoid_if_before_free.

diff --git a/ChangeLog b/ChangeLog
index 9e4e990..09d4b0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
 
+	* ftp/cmds.c (ls, setnmap): Fix syntax-check
+	sc_avoid_if_before_free.
+
+	* ftp/ftp.c (login, recvrequest, pswitch, gunique): Likewise.
+	* ftp/ruserpass.c (ruserpass): Likewise.
+	* ftpd/auth.c (auth_user, sgetcred): Likewise.
+	* ftpd/ftpcmd.y (cmd_list, cmd, rcmd): Likewise.
+	* ftpd/ftpd.c (curdir, end_login, dolog, send_file_list): Likewise.
+	* ftpd/pam.c (pam_user): Likewise.
+	* ifconfig/if_index.c (if_freenameindex): Likewise.
+	* inetd/inetd.c (freeconfig, getconfigent): Likewise.
+	* libinetutils/argcv.c (int argcv_free): Likewise.
+	* libls/fts.c (fts_close, fts_build): Likewise.
+	* libtelnet/kerberos5.c (kerberos5_is_auth): Likewise.
+	* libtelnet/misc.c (auth_encrypt_init, auth_encrypt_user): Likewise.
+	* syslogd/syslogd.c (main, logmsg): Likewise.
+	* telnet/commands.c (env_define, env_undefine, tn): Likewise.
+	* telnetd/state.c (suboption): Likewise.
+	* telnetd/utility.c (getterminaltype): Likewise.
+	* tftpd/tftpd.c (validate_access): Likewise.
+
+2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
+
 	* doc/inetutils.texi: Don't split copyright year list.
 
 2009-11-14  Simon Josefsson  <simon@josefsson.org>
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 172fa5d..c797959 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -1510,8 +1510,7 @@ ls (argc, argv)
 
   recvrequest (cmd, dest ? dest : "-", argv[1], "w", 0);
 out:
-  if (dest)
-    free (dest);
+  free (dest);
 }
 
 /*
@@ -2233,14 +2232,12 @@ setnmap (argc, argv)
     }
   *cp = '\0';
 
-  if (mapin)
-    free (mapin);
+  free (mapin);
   mapin = strdup (altarg);
 
   while (*++cp == ' ')
     continue;
-  if (mapout)
-    free (mapout);
+  free (mapout);
   mapout = strdup (cp);
 }
 
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 2decbf7..dd47cf9 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -326,8 +326,7 @@ login (host)
     {
       if (!strcmp ("init", macros[n].mac_name))
 	{
-	  if (line)
-	    free (line);
+	  free (line);
 	  line = calloc (200, sizeof (*line));
 	  if (!line)
 	    quit (0, 0);
@@ -964,8 +963,7 @@ recvrequest (cmd, local, remote, lmode, printnames)
   blksize = BUFSIZ;
   if (blksize > bufsize)
     {
-      if (buf)
-	free (buf);
+      free (buf);
       buf = malloc ((unsigned) blksize);
       if (buf == NULL)
 	{
@@ -1420,8 +1418,7 @@ pswitch (flag)
   ip->connect = connected;
   connected = op->connect;
 
-  if (ip->name)
-    free (ip->name);
+  free (ip->name);
   ip->name = hostname;
   hostname = op->name;
   op->name = 0;
@@ -1457,14 +1454,12 @@ pswitch (flag)
   ip->mapflg = mapflag;
   mapflag = op->mapflg;
 
-  if (ip->mi)
-    free (ip->mi);
+  free (ip->mi);
   ip->mi = mapin;
   mapin = op->mi;
   op->mi = 0;
 
-  if (ip->mo)
-    free (ip->mo);
+  free (ip->mo);
   ip->mo = mapout;
   mapout = op->mo;
   op->mo = 0;
@@ -1655,8 +1650,7 @@ gunique (local)
   int count = 0;
   char ext = '1';
 
-  if (new)
-    free (new);
+  free (new);
   new = malloc (strlen (local) + 1 + 3 + 1);	/* '.' + 100 + '\0' */
   if (!new)
     {
diff --git a/ftp/ruserpass.c b/ftp/ruserpass.c
index 3eb3dc1..f3b4fcf 100644
--- a/ftp/ruserpass.c
+++ b/ftp/ruserpass.c
@@ -142,7 +142,7 @@ ruserpass (char *host, char **aname, char **apass, char **aacct)
   mydomain = strchr (myname, '.');
   if (mydomain == NULL)
     mydomain = xstrdup ("");
-next:
+ next:
   while ((t = token ()))
     switch (t)
       {
@@ -304,13 +304,11 @@ next:
       }
 done:
   fclose (cfile);
-  if (myname)
-    free (myname);
+  free (myname);
   return (0);
 bad:
   fclose (cfile);
-  if (myname)
-    free (myname);
+  free (myname);
   return (-1);
 }
 
diff --git a/ftpd/auth.c b/ftpd/auth.c
index cddcdfb..3c612f6 100644
--- a/ftpd/auth.c
+++ b/ftpd/auth.c
@@ -81,8 +81,7 @@ auth_user (const char *name, struct credentials *pcred)
     default:
       {
 	size_t len;
-	if (pcred->message)
-	  free (pcred->message);
+	free (pcred->message);
 	len = (size_t) (64 + strlen (name));
 	pcred->message = malloc (len);
 	if (pcred->message == NULL)
@@ -194,16 +193,11 @@ sgetcred (const char *name, struct credentials *pcred)
   if (p == NULL)
     return 1;
 
-  if (pcred->name)
-    free (pcred->name);
-  if (pcred->passwd)
-    free (pcred->passwd);
-  if (pcred->homedir)
-    free (pcred->homedir);
-  if (pcred->rootdir)
-    free (pcred->rootdir);
-  if (pcred->shell)
-    free (pcred->shell);
+  free (pcred->name);
+  free (pcred->passwd);
+  free (pcred->homedir);
+  free (pcred->rootdir);
+  free (pcred->shell);
 
 #if defined(HAVE_GETSPNAM) && defined(HAVE_SHADOW_H)
   if (p->pw_passwd == NULL || strlen (p->pw_passwd) == 1)
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index da2123e..e52ff61 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -146,8 +146,7 @@ cmd_list
 	: /* empty */
 	| cmd_list cmd
 		{
-			if (fromname != NULL)
-				free (fromname);
+			free (fromname);
 			fromname = (char *) 0;
 			restart_point = (off_t) 0;
 		}
@@ -264,22 +263,19 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				retrieve((char *) 0, $4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| STOR check_login SP pathname CRLF
 		{
 			if ($2 && $4 != NULL)
 				store($4, "w", 0);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| APPE check_login SP pathname CRLF
 		{
 			if ($2 && $4 != NULL)
 				store($4, "a", 0);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| NLST check_login CRLF
 		{
@@ -290,8 +286,7 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				send_file_list($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| LIST check_login CRLF
 		{
@@ -302,15 +297,13 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				retrieve("/bin/ls -lgA %s", $4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| STAT check_login SP pathname CRLF
 		{
 			if ($2 && $4 != NULL)
 				statfilecmd($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| STAT CRLF
 		{
@@ -320,8 +313,7 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				delete($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| RNTO check_login SP pathname CRLF
 		{
@@ -349,8 +341,7 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				cwd($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| HELP CRLF
 		{
@@ -370,8 +361,7 @@ cmd
 					help(sitetab, (char *) 0);
 			} else
 				help(cmdtab, $3);
-			if ($3 != NULL)
-			    free ($3);
+		    free ($3);
 		}
 	| NOOP CRLF
 		{
@@ -381,15 +371,13 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				makedir($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| RMD check_login SP pathname CRLF
 		{
 			if ($2 && $4 != NULL)
 				removedir($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| PWD check_login CRLF
 		{
@@ -408,8 +396,7 @@ cmd
 	| SITE SP HELP SP STRING CRLF
 		{
 			help(sitetab, $5);
-			if ($5 != NULL)
-			    free ($5);
+			free ($5);
 		}
 	| SITE SP UMASK check_login CRLF
 		{
@@ -447,8 +434,7 @@ cmd
 				else
 					reply(200, "CHMOD command successful.");
 			}
-			if ($8 != NULL)
-				free($8);
+			free($8);
 		}
 	| SITE SP IDLE CRLF
 		{
@@ -476,8 +462,7 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				store($4, "w", 1);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| SYST CRLF
 		{
@@ -513,8 +498,7 @@ cmd
 				reply(215, "%s Type: L%d", sys_type, NBBY);
 
 #ifdef HAVE_UNAME
-			if (version)
-				free (version);
+			free (version);
 #endif
 		}
 
@@ -529,8 +513,7 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				sizecmd($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 
 		/*
@@ -561,8 +544,7 @@ cmd
 					    t->tm_sec);
 				}
 			}
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| QUIT CRLF
 		{
@@ -579,8 +561,7 @@ rcmd
 		{
 			restart_point = (off_t) 0;
 			if ($2 && $4) {
-			    if (fromname != NULL)
-				free (fromname);
+			    free (fromname);
 			    fromname = renamefrom($4);
 			}
 			if (fromname == (char *) 0 && $4)
@@ -588,8 +569,7 @@ rcmd
 		}
 	| REST SP byte_size CRLF
 		{
-		    	if (fromname != NULL)
-				free (fromname);
+		        free (fromname);
 			fromname = (char *) 0;
 			restart_point = $3;	/* XXX $3 is only "int" */
 			reply(350,
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 756a118..d114d18 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -556,8 +556,7 @@ curdir (void)
 {
   static char *path = 0;
   extern char *xgetcwd (void);
-  if (path)
-    free (path);
+  free (path);
   path = xgetcwd ();
   if (!path)
     return (char *) "";
@@ -780,26 +779,21 @@ end_login (struct credentials *pcred)
   if (pcred->logged_in)
     logwtmp_keep_open (ttyline, "", "");
 
-  if (pcred->name)
-    free (pcred->name);
+  free (pcred->name);
   if (pcred->passwd)
     {
       memset (pcred->passwd, 0, strlen (pcred->passwd));
       free (pcred->passwd);
     }
-  if (pcred->homedir)
-    free (pcred->homedir);
-  if (pcred->rootdir)
-    free (pcred->rootdir);
-  if (pcred->shell)
-    free (pcred->shell);
+  free (pcred->homedir);
+  free (pcred->rootdir);
+  free (pcred->shell);
   if (pcred->pass)		/* ??? */
     {
       memset (pcred->pass, 0, strlen (pcred->pass));
       free (pcred->pass);
     }
-  if (pcred->message)
-    free (pcred->message);
+  free (pcred->message);
   memset (pcred, 0, sizeof (*pcred));
   pcred->remotehost = remotehost;
   pcred->auth_type = atype;
@@ -1666,8 +1660,7 @@ dolog (struct sockaddr_in *sin, struct credentials *pcred)
   else
     name = inet_ntoa (sin->sin_addr);
 
-  if (pcred->remotehost)
-    free (pcred->remotehost);
+  free (pcred->remotehost);
   pcred->remotehost = sgetsave (name);
 
 #ifdef HAVE_SETPROCTITLE
@@ -1799,9 +1792,7 @@ gunique (const char *local)
   if (cp)
     *cp = '/';
 
-  if (string)
-    free (string);
-
+  free (string);
   string = malloc (strlen (local) + 5);	/* '.' + DIG + DIG + '\0' */
   if (string)
     {
@@ -1979,8 +1970,7 @@ send_file_list (const char *whichf)
   data = -1;
   pdata = -1;
 out:
-  if (p)
-    free (p);
+  free (p);
   if (freeglob)
     {
       freeglob = 0;
diff --git a/ftpd/pam.c b/ftpd/pam.c
index df80df0..ae0a2a8 100644
--- a/ftpd/pam.c
+++ b/ftpd/pam.c
@@ -214,11 +214,9 @@ pam_user (const char *username, struct credentials *pcred)
       pamh = 0;
     }
 
-  if (pcred->name)
-    free (pcred->name);
+  free (pcred->name);
   pcred->name = strdup (username);
-  if (pcred->message)
-    free (pcred->message);
+  free (pcred->message);
   pcred->message = NULL;
 
   error = pam_start ("ftp", pcred->name, &PAM_conversation, &pamh);
diff --git a/ifconfig/if_index.c b/ifconfig/if_index.c
index ac02e4b..bb5c2b5 100644
--- a/ifconfig/if_index.c
+++ b/ifconfig/if_index.c
@@ -87,8 +87,7 @@ if_freenameindex (struct if_nameindex *ifn)
     return;
   while (ptr->if_name || ptr->if_index)
     {
-      if (ptr->if_name)
-	free (ptr->if_name);
+      free (ptr->if_name);
       ++ptr;
     }
   free (ifn);
diff --git a/inetd/inetd.c b/inetd/inetd.c
index 0b6d6d9..f2c1e3b 100644
--- a/inetd/inetd.c
+++ b/inetd/inetd.c
@@ -964,16 +964,11 @@ endconfig (FILE *fconfig)
 void
 freeconfig (struct servtab *cp)
 {
-  if (cp->se_node)
-    free (cp->se_node);
-  if (cp->se_service)
-    free (cp->se_service);
-  if (cp->se_proto)
-    free (cp->se_proto);
-  if (cp->se_user)
-    free (cp->se_user);
-  if (cp->se_server)
-    free (cp->se_server);
+  free (cp->se_node);
+  free (cp->se_service);
+  free (cp->se_proto);
+  free (cp->se_user);
+  free (cp->se_server);
   argcv_free (cp->se_argc, cp->se_argv);
 }
 
@@ -1057,8 +1052,7 @@ getconfigent (FILE *fconfig, const char *file, size_t *line)
 	  if (argc == 1 && argv[0][strlen (argv[0]) - 1] == ':')
 	    {
 	      argv[0][strlen (argv[0]) - 1] = 0;
-	      if (global_serv_node)
-		free (global_serv_node);
+	      free (global_serv_node);
 	      if (strcmp (argv[0], "*"))
 		global_serv_node = newstr (argv[0]);
 	    }
diff --git a/libinetutils/argcv.c b/libinetutils/argcv.c
index e84acd1..c96918a 100644
--- a/libinetutils/argcv.c
+++ b/libinetutils/argcv.c
@@ -125,8 +125,7 @@ int
 argcv_free (int argc, char **argv)
 {
   while (--argc >= 0)
-    if (argv[argc])
-      free (argv[argc]);
+    free (argv[argc]);
   free (argv);
   return 1;
 }
diff --git a/libls/fts.c b/libls/fts.c
index cf10252..7039937 100644
--- a/libls/fts.c
+++ b/libls/fts.c
@@ -272,8 +272,7 @@ fts_close (sp)
   /* Free up child linked list, sort array, path buffer. */
   if (sp->fts_child)
     fts_lfree (sp->fts_child);
-  if (sp->fts_array)
-    free (sp->fts_array);
+  free (sp->fts_array);
   free (sp->fts_path);
 
   /* Return to original directory, save errno if necessary. */
@@ -756,8 +755,7 @@ fts_build (sp, type)
 	       * structures already allocated.
 	       */
 	    mem1:saved_errno = errno;
-	      if (p)
-		free (p);
+	      free (p);
 	      fts_lfree (head);
 	      closedir (dirp);
 	      errno = saved_errno;
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index edc4bb2..e82ec72 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -588,8 +588,7 @@ kerberos5_is_auth (TN_Authenticator * ap, unsigned char *data, int cnt,
 	  name ? name : ""));
   auth_finished (ap, AUTH_USER);
 
-  if (name)
-    free (name);
+  free (name);
   krb5_auth_con_getremotesubkey (telnet_context, auth_context, &newkey);
 
   if (session_key)
@@ -836,8 +835,7 @@ kerberos5_forward (TN_Authenticator * ap)
     krb5_free_principal (telnet_context, client);
   if (server)
     krb5_free_principal (telnet_context, server);
-  if (forw_creds.data)
-    free (forw_creds.data);
+  free (forw_creds.data);
   krb5_cc_close (telnet_context, ccache);
 }
 # endif
diff --git a/libtelnet/misc.c b/libtelnet/misc.c
index 92b436c..61098f6 100644
--- a/libtelnet/misc.c
+++ b/libtelnet/misc.c
@@ -73,11 +73,8 @@ auth_encrypt_init (char *local, char *remote, char *name, int server)
 #ifdef	ENCRYPTION
   encrypt_init (name, server);
 #endif /* ENCRYPTION */
-  if (UserNameRequested)
-    {
-      free (UserNameRequested);
-      UserNameRequested = 0;
-    }
+  free (UserNameRequested);
+  UserNameRequested = 0;
 }
 
 void
@@ -85,8 +82,7 @@ auth_encrypt_user (char *name)
 {
   extern char *strdup (const char *);
 
-  if (UserNameRequested)
-    free (UserNameRequested);
+  free (UserNameRequested);
   UserNameRequested = name ? strdup (name) : 0;
 }
 
diff --git a/syslogd/syslogd.c b/syslogd/syslogd.c
index 9443846..2d4b531 100644
--- a/syslogd/syslogd.c
+++ b/syslogd/syslogd.c
@@ -491,8 +491,7 @@ main (int argc, char *argv[])
       if (host_ent)
 	{
 	  /* Override what we had */
-	  if (LocalHostName)
-	    free (LocalHostName);
+	  free (LocalHostName);
 	  LocalHostName = strdup (host_ent->h_name);
 	  p = strchr (LocalHostName, '.');
 	  if (p != NULL)
@@ -1103,8 +1102,7 @@ logmsg (int pri, const char *msg, const char *from, int flags)
 	    fprintlog (f, from, 0, (char *) NULL);
 	  f->f_repeatcount = 0;
 	  strncpy (f->f_lasttime, timestamp, sizeof (f->f_lasttime) - 1);
-	  if (f->f_prevhost)
-	    free (f->f_prevhost);
+	  free (f->f_prevhost);
 	  f->f_prevhost = strdup (from);
 	  if (msglen < MAXSVLINE)
 	    {
diff --git a/telnet/commands.c b/telnet/commands.c
index e1491b4..a9bd98b 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -1923,10 +1923,8 @@ env_define (unsigned char *var, unsigned char *value)
 
   if (ep = env_find (var))
     {
-      if (ep->var)
-	free (ep->var);
-      if (ep->value)
-	free (ep->value);
+      free (ep->var);
+      free (ep->value);
     }
   else
     {
@@ -1954,10 +1952,8 @@ env_undefine (unsigned char *var)
       ep->prev->next = ep->next;
       if (ep->next)
 	ep->next->prev = ep->prev;
-      if (ep->var)
-	free (ep->var);
-      if (ep->value)
-	free (ep->value);
+      free (ep->var);
+      free (ep->value);
       free (ep);
     }
 }
@@ -2552,8 +2548,7 @@ tn (int argc, char *argv[])
 	telnetport = 0;
     }
 
-  if (hostname)
-    free (hostname);
+  free (hostname);
   hostname = malloc (strlen (hostp) + 1);
   if (hostname)
     strcpy (hostname, hostp);
diff --git a/telnetd/state.c b/telnetd/state.c
index 0e59456..c6ebb1b 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -1180,8 +1180,7 @@ suboption ()
 	if (SB_EOF () || SB_GET () != TELQUAL_IS)
 	  return;		/* ??? XXX but, this is the most robust */
 
-	if (terminaltype)
-	  free (terminaltype);
+	free (terminaltype);
 
 	obstack_init (&stk);
 	while (!SB_EOF ())
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 58edcb6..800e104 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -760,14 +760,12 @@ getterminaltype (char *user_name)
        */
       if (his_state_is_will (TELOPT_TTYPE) && !terminaltypeok (terminaltype))
 	{
-	  if (first)
-	    free (first);
+	  free (first);
 	  first = xstrdup (terminaltype);
 	  for (;;)
 	    {
 	      /* Save the unknown name, and request the next name. */
-	      if (last)
-		free (last);
+	      free (last);
 	      last = xstrdup (terminaltype);
 	      _gettermname ();
 	      if (terminaltypeok (terminaltype))
@@ -796,10 +794,8 @@ getterminaltype (char *user_name)
 		}
 	    }
 	}
-      if (first)
-	free (first);
-      if (last)
-	free (last);
+      free (first);
+      free (last);
     }
   return retval;
 }
diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c
index fdf1a23..dcec421 100644
--- a/tftpd/tftpd.c
+++ b/tftpd/tftpd.c
@@ -466,8 +466,7 @@ validate_access (char **filep, int mode)
       err = ENOTFOUND;
       for (dirp = dirs; dirp->name != NULL; dirp++)
 	{
-	  if (pathname)
-	    free (pathname);
+	  free (pathname);
 	  pathname = malloc (strlen (dirp->name) + 1 + strlen (filename) + 1);
 	  if (!pathname)
 	    return ENOMEM;

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


commit b033f20780fde4507c77a9c4ac6c23c780cc3609
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 14 15:34:06 2009 +0100

    Fix syntax-check sc_avoid_if_before_free.

diff --git a/ChangeLog b/ChangeLog
index 9e4e990..09d4b0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
 
+	* ftp/cmds.c (ls, setnmap): Fix syntax-check
+	sc_avoid_if_before_free.
+
+	* ftp/ftp.c (login, recvrequest, pswitch, gunique): Likewise.
+	* ftp/ruserpass.c (ruserpass): Likewise.
+	* ftpd/auth.c (auth_user, sgetcred): Likewise.
+	* ftpd/ftpcmd.y (cmd_list, cmd, rcmd): Likewise.
+	* ftpd/ftpd.c (curdir, end_login, dolog, send_file_list): Likewise.
+	* ftpd/pam.c (pam_user): Likewise.
+	* ifconfig/if_index.c (if_freenameindex): Likewise.
+	* inetd/inetd.c (freeconfig, getconfigent): Likewise.
+	* libinetutils/argcv.c (int argcv_free): Likewise.
+	* libls/fts.c (fts_close, fts_build): Likewise.
+	* libtelnet/kerberos5.c (kerberos5_is_auth): Likewise.
+	* libtelnet/misc.c (auth_encrypt_init, auth_encrypt_user): Likewise.
+	* syslogd/syslogd.c (main, logmsg): Likewise.
+	* telnet/commands.c (env_define, env_undefine, tn): Likewise.
+	* telnetd/state.c (suboption): Likewise.
+	* telnetd/utility.c (getterminaltype): Likewise.
+	* tftpd/tftpd.c (validate_access): Likewise.
+
+2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
+
 	* doc/inetutils.texi: Don't split copyright year list.
 
 2009-11-14  Simon Josefsson  <simon@josefsson.org>
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 172fa5d..c797959 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -1510,8 +1510,7 @@ ls (argc, argv)
 
   recvrequest (cmd, dest ? dest : "-", argv[1], "w", 0);
 out:
-  if (dest)
-    free (dest);
+  free (dest);
 }
 
 /*
@@ -2233,14 +2232,12 @@ setnmap (argc, argv)
     }
   *cp = '\0';
 
-  if (mapin)
-    free (mapin);
+  free (mapin);
   mapin = strdup (altarg);
 
   while (*++cp == ' ')
     continue;
-  if (mapout)
-    free (mapout);
+  free (mapout);
   mapout = strdup (cp);
 }
 
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 2decbf7..dd47cf9 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -326,8 +326,7 @@ login (host)
     {
       if (!strcmp ("init", macros[n].mac_name))
 	{
-	  if (line)
-	    free (line);
+	  free (line);
 	  line = calloc (200, sizeof (*line));
 	  if (!line)
 	    quit (0, 0);
@@ -964,8 +963,7 @@ recvrequest (cmd, local, remote, lmode, printnames)
   blksize = BUFSIZ;
   if (blksize > bufsize)
     {
-      if (buf)
-	free (buf);
+      free (buf);
       buf = malloc ((unsigned) blksize);
       if (buf == NULL)
 	{
@@ -1420,8 +1418,7 @@ pswitch (flag)
   ip->connect = connected;
   connected = op->connect;
 
-  if (ip->name)
-    free (ip->name);
+  free (ip->name);
   ip->name = hostname;
   hostname = op->name;
   op->name = 0;
@@ -1457,14 +1454,12 @@ pswitch (flag)
   ip->mapflg = mapflag;
   mapflag = op->mapflg;
 
-  if (ip->mi)
-    free (ip->mi);
+  free (ip->mi);
   ip->mi = mapin;
   mapin = op->mi;
   op->mi = 0;
 
-  if (ip->mo)
-    free (ip->mo);
+  free (ip->mo);
   ip->mo = mapout;
   mapout = op->mo;
   op->mo = 0;
@@ -1655,8 +1650,7 @@ gunique (local)
   int count = 0;
   char ext = '1';
 
-  if (new)
-    free (new);
+  free (new);
   new = malloc (strlen (local) + 1 + 3 + 1);	/* '.' + 100 + '\0' */
   if (!new)
     {
diff --git a/ftp/ruserpass.c b/ftp/ruserpass.c
index 3eb3dc1..f3b4fcf 100644
--- a/ftp/ruserpass.c
+++ b/ftp/ruserpass.c
@@ -142,7 +142,7 @@ ruserpass (char *host, char **aname, char **apass, char **aacct)
   mydomain = strchr (myname, '.');
   if (mydomain == NULL)
     mydomain = xstrdup ("");
-next:
+ next:
   while ((t = token ()))
     switch (t)
       {
@@ -304,13 +304,11 @@ next:
       }
 done:
   fclose (cfile);
-  if (myname)
-    free (myname);
+  free (myname);
   return (0);
 bad:
   fclose (cfile);
-  if (myname)
-    free (myname);
+  free (myname);
   return (-1);
 }
 
diff --git a/ftpd/auth.c b/ftpd/auth.c
index cddcdfb..3c612f6 100644
--- a/ftpd/auth.c
+++ b/ftpd/auth.c
@@ -81,8 +81,7 @@ auth_user (const char *name, struct credentials *pcred)
     default:
       {
 	size_t len;
-	if (pcred->message)
-	  free (pcred->message);
+	free (pcred->message);
 	len = (size_t) (64 + strlen (name));
 	pcred->message = malloc (len);
 	if (pcred->message == NULL)
@@ -194,16 +193,11 @@ sgetcred (const char *name, struct credentials *pcred)
   if (p == NULL)
     return 1;
 
-  if (pcred->name)
-    free (pcred->name);
-  if (pcred->passwd)
-    free (pcred->passwd);
-  if (pcred->homedir)
-    free (pcred->homedir);
-  if (pcred->rootdir)
-    free (pcred->rootdir);
-  if (pcred->shell)
-    free (pcred->shell);
+  free (pcred->name);
+  free (pcred->passwd);
+  free (pcred->homedir);
+  free (pcred->rootdir);
+  free (pcred->shell);
 
 #if defined(HAVE_GETSPNAM) && defined(HAVE_SHADOW_H)
   if (p->pw_passwd == NULL || strlen (p->pw_passwd) == 1)
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index da2123e..e52ff61 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -146,8 +146,7 @@ cmd_list
 	: /* empty */
 	| cmd_list cmd
 		{
-			if (fromname != NULL)
-				free (fromname);
+			free (fromname);
 			fromname = (char *) 0;
 			restart_point = (off_t) 0;
 		}
@@ -264,22 +263,19 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				retrieve((char *) 0, $4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| STOR check_login SP pathname CRLF
 		{
 			if ($2 && $4 != NULL)
 				store($4, "w", 0);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| APPE check_login SP pathname CRLF
 		{
 			if ($2 && $4 != NULL)
 				store($4, "a", 0);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| NLST check_login CRLF
 		{
@@ -290,8 +286,7 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				send_file_list($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| LIST check_login CRLF
 		{
@@ -302,15 +297,13 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				retrieve("/bin/ls -lgA %s", $4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| STAT check_login SP pathname CRLF
 		{
 			if ($2 && $4 != NULL)
 				statfilecmd($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| STAT CRLF
 		{
@@ -320,8 +313,7 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				delete($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| RNTO check_login SP pathname CRLF
 		{
@@ -349,8 +341,7 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				cwd($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| HELP CRLF
 		{
@@ -370,8 +361,7 @@ cmd
 					help(sitetab, (char *) 0);
 			} else
 				help(cmdtab, $3);
-			if ($3 != NULL)
-			    free ($3);
+		    free ($3);
 		}
 	| NOOP CRLF
 		{
@@ -381,15 +371,13 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				makedir($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| RMD check_login SP pathname CRLF
 		{
 			if ($2 && $4 != NULL)
 				removedir($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| PWD check_login CRLF
 		{
@@ -408,8 +396,7 @@ cmd
 	| SITE SP HELP SP STRING CRLF
 		{
 			help(sitetab, $5);
-			if ($5 != NULL)
-			    free ($5);
+			free ($5);
 		}
 	| SITE SP UMASK check_login CRLF
 		{
@@ -447,8 +434,7 @@ cmd
 				else
 					reply(200, "CHMOD command successful.");
 			}
-			if ($8 != NULL)
-				free($8);
+			free($8);
 		}
 	| SITE SP IDLE CRLF
 		{
@@ -476,8 +462,7 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				store($4, "w", 1);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| SYST CRLF
 		{
@@ -513,8 +498,7 @@ cmd
 				reply(215, "%s Type: L%d", sys_type, NBBY);
 
 #ifdef HAVE_UNAME
-			if (version)
-				free (version);
+			free (version);
 #endif
 		}
 
@@ -529,8 +513,7 @@ cmd
 		{
 			if ($2 && $4 != NULL)
 				sizecmd($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 
 		/*
@@ -561,8 +544,7 @@ cmd
 					    t->tm_sec);
 				}
 			}
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| QUIT CRLF
 		{
@@ -579,8 +561,7 @@ rcmd
 		{
 			restart_point = (off_t) 0;
 			if ($2 && $4) {
-			    if (fromname != NULL)
-				free (fromname);
+			    free (fromname);
 			    fromname = renamefrom($4);
 			}
 			if (fromname == (char *) 0 && $4)
@@ -588,8 +569,7 @@ rcmd
 		}
 	| REST SP byte_size CRLF
 		{
-		    	if (fromname != NULL)
-				free (fromname);
+		        free (fromname);
 			fromname = (char *) 0;
 			restart_point = $3;	/* XXX $3 is only "int" */
 			reply(350,
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 756a118..d114d18 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -556,8 +556,7 @@ curdir (void)
 {
   static char *path = 0;
   extern char *xgetcwd (void);
-  if (path)
-    free (path);
+  free (path);
   path = xgetcwd ();
   if (!path)
     return (char *) "";
@@ -780,26 +779,21 @@ end_login (struct credentials *pcred)
   if (pcred->logged_in)
     logwtmp_keep_open (ttyline, "", "");
 
-  if (pcred->name)
-    free (pcred->name);
+  free (pcred->name);
   if (pcred->passwd)
     {
       memset (pcred->passwd, 0, strlen (pcred->passwd));
       free (pcred->passwd);
     }
-  if (pcred->homedir)
-    free (pcred->homedir);
-  if (pcred->rootdir)
-    free (pcred->rootdir);
-  if (pcred->shell)
-    free (pcred->shell);
+  free (pcred->homedir);
+  free (pcred->rootdir);
+  free (pcred->shell);
   if (pcred->pass)		/* ??? */
     {
       memset (pcred->pass, 0, strlen (pcred->pass));
       free (pcred->pass);
     }
-  if (pcred->message)
-    free (pcred->message);
+  free (pcred->message);
   memset (pcred, 0, sizeof (*pcred));
   pcred->remotehost = remotehost;
   pcred->auth_type = atype;
@@ -1666,8 +1660,7 @@ dolog (struct sockaddr_in *sin, struct credentials *pcred)
   else
     name = inet_ntoa (sin->sin_addr);
 
-  if (pcred->remotehost)
-    free (pcred->remotehost);
+  free (pcred->remotehost);
   pcred->remotehost = sgetsave (name);
 
 #ifdef HAVE_SETPROCTITLE
@@ -1799,9 +1792,7 @@ gunique (const char *local)
   if (cp)
     *cp = '/';
 
-  if (string)
-    free (string);
-
+  free (string);
   string = malloc (strlen (local) + 5);	/* '.' + DIG + DIG + '\0' */
   if (string)
     {
@@ -1979,8 +1970,7 @@ send_file_list (const char *whichf)
   data = -1;
   pdata = -1;
 out:
-  if (p)
-    free (p);
+  free (p);
   if (freeglob)
     {
       freeglob = 0;
diff --git a/ftpd/pam.c b/ftpd/pam.c
index df80df0..ae0a2a8 100644
--- a/ftpd/pam.c
+++ b/ftpd/pam.c
@@ -214,11 +214,9 @@ pam_user (const char *username, struct credentials *pcred)
       pamh = 0;
     }
 
-  if (pcred->name)
-    free (pcred->name);
+  free (pcred->name);
   pcred->name = strdup (username);
-  if (pcred->message)
-    free (pcred->message);
+  free (pcred->message);
   pcred->message = NULL;
 
   error = pam_start ("ftp", pcred->name, &PAM_conversation, &pamh);
diff --git a/ifconfig/if_index.c b/ifconfig/if_index.c
index ac02e4b..bb5c2b5 100644
--- a/ifconfig/if_index.c
+++ b/ifconfig/if_index.c
@@ -87,8 +87,7 @@ if_freenameindex (struct if_nameindex *ifn)
     return;
   while (ptr->if_name || ptr->if_index)
     {
-      if (ptr->if_name)
-	free (ptr->if_name);
+      free (ptr->if_name);
       ++ptr;
     }
   free (ifn);
diff --git a/inetd/inetd.c b/inetd/inetd.c
index 0b6d6d9..f2c1e3b 100644
--- a/inetd/inetd.c
+++ b/inetd/inetd.c
@@ -964,16 +964,11 @@ endconfig (FILE *fconfig)
 void
 freeconfig (struct servtab *cp)
 {
-  if (cp->se_node)
-    free (cp->se_node);
-  if (cp->se_service)
-    free (cp->se_service);
-  if (cp->se_proto)
-    free (cp->se_proto);
-  if (cp->se_user)
-    free (cp->se_user);
-  if (cp->se_server)
-    free (cp->se_server);
+  free (cp->se_node);
+  free (cp->se_service);
+  free (cp->se_proto);
+  free (cp->se_user);
+  free (cp->se_server);
   argcv_free (cp->se_argc, cp->se_argv);
 }
 
@@ -1057,8 +1052,7 @@ getconfigent (FILE *fconfig, const char *file, size_t *line)
 	  if (argc == 1 && argv[0][strlen (argv[0]) - 1] == ':')
 	    {
 	      argv[0][strlen (argv[0]) - 1] = 0;
-	      if (global_serv_node)
-		free (global_serv_node);
+	      free (global_serv_node);
 	      if (strcmp (argv[0], "*"))
 		global_serv_node = newstr (argv[0]);
 	    }
diff --git a/libinetutils/argcv.c b/libinetutils/argcv.c
index e84acd1..c96918a 100644
--- a/libinetutils/argcv.c
+++ b/libinetutils/argcv.c
@@ -125,8 +125,7 @@ int
 argcv_free (int argc, char **argv)
 {
   while (--argc >= 0)
-    if (argv[argc])
-      free (argv[argc]);
+    free (argv[argc]);
   free (argv);
   return 1;
 }
diff --git a/libls/fts.c b/libls/fts.c
index cf10252..7039937 100644
--- a/libls/fts.c
+++ b/libls/fts.c
@@ -272,8 +272,7 @@ fts_close (sp)
   /* Free up child linked list, sort array, path buffer. */
   if (sp->fts_child)
     fts_lfree (sp->fts_child);
-  if (sp->fts_array)
-    free (sp->fts_array);
+  free (sp->fts_array);
   free (sp->fts_path);
 
   /* Return to original directory, save errno if necessary. */
@@ -756,8 +755,7 @@ fts_build (sp, type)
 	       * structures already allocated.
 	       */
 	    mem1:saved_errno = errno;
-	      if (p)
-		free (p);
+	      free (p);
 	      fts_lfree (head);
 	      closedir (dirp);
 	      errno = saved_errno;
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index edc4bb2..e82ec72 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -588,8 +588,7 @@ kerberos5_is_auth (TN_Authenticator * ap, unsigned char *data, int cnt,
 	  name ? name : ""));
   auth_finished (ap, AUTH_USER);
 
-  if (name)
-    free (name);
+  free (name);
   krb5_auth_con_getremotesubkey (telnet_context, auth_context, &newkey);
 
   if (session_key)
@@ -836,8 +835,7 @@ kerberos5_forward (TN_Authenticator * ap)
     krb5_free_principal (telnet_context, client);
   if (server)
     krb5_free_principal (telnet_context, server);
-  if (forw_creds.data)
-    free (forw_creds.data);
+  free (forw_creds.data);
   krb5_cc_close (telnet_context, ccache);
 }
 # endif
diff --git a/libtelnet/misc.c b/libtelnet/misc.c
index 92b436c..61098f6 100644
--- a/libtelnet/misc.c
+++ b/libtelnet/misc.c
@@ -73,11 +73,8 @@ auth_encrypt_init (char *local, char *remote, char *name, int server)
 #ifdef	ENCRYPTION
   encrypt_init (name, server);
 #endif /* ENCRYPTION */
-  if (UserNameRequested)
-    {
-      free (UserNameRequested);
-      UserNameRequested = 0;
-    }
+  free (UserNameRequested);
+  UserNameRequested = 0;
 }
 
 void
@@ -85,8 +82,7 @@ auth_encrypt_user (char *name)
 {
   extern char *strdup (const char *);
 
-  if (UserNameRequested)
-    free (UserNameRequested);
+  free (UserNameRequested);
   UserNameRequested = name ? strdup (name) : 0;
 }
 
diff --git a/syslogd/syslogd.c b/syslogd/syslogd.c
index 9443846..2d4b531 100644
--- a/syslogd/syslogd.c
+++ b/syslogd/syslogd.c
@@ -491,8 +491,7 @@ main (int argc, char *argv[])
       if (host_ent)
 	{
 	  /* Override what we had */
-	  if (LocalHostName)
-	    free (LocalHostName);
+	  free (LocalHostName);
 	  LocalHostName = strdup (host_ent->h_name);
 	  p = strchr (LocalHostName, '.');
 	  if (p != NULL)
@@ -1103,8 +1102,7 @@ logmsg (int pri, const char *msg, const char *from, int flags)
 	    fprintlog (f, from, 0, (char *) NULL);
 	  f->f_repeatcount = 0;
 	  strncpy (f->f_lasttime, timestamp, sizeof (f->f_lasttime) - 1);
-	  if (f->f_prevhost)
-	    free (f->f_prevhost);
+	  free (f->f_prevhost);
 	  f->f_prevhost = strdup (from);
 	  if (msglen < MAXSVLINE)
 	    {
diff --git a/telnet/commands.c b/telnet/commands.c
index e1491b4..a9bd98b 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -1923,10 +1923,8 @@ env_define (unsigned char *var, unsigned char *value)
 
   if (ep = env_find (var))
     {
-      if (ep->var)
-	free (ep->var);
-      if (ep->value)
-	free (ep->value);
+      free (ep->var);
+      free (ep->value);
     }
   else
     {
@@ -1954,10 +1952,8 @@ env_undefine (unsigned char *var)
       ep->prev->next = ep->next;
       if (ep->next)
 	ep->next->prev = ep->prev;
-      if (ep->var)
-	free (ep->var);
-      if (ep->value)
-	free (ep->value);
+      free (ep->var);
+      free (ep->value);
       free (ep);
     }
 }
@@ -2552,8 +2548,7 @@ tn (int argc, char *argv[])
 	telnetport = 0;
     }
 
-  if (hostname)
-    free (hostname);
+  free (hostname);
   hostname = malloc (strlen (hostp) + 1);
   if (hostname)
     strcpy (hostname, hostp);
diff --git a/telnetd/state.c b/telnetd/state.c
index 0e59456..c6ebb1b 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -1180,8 +1180,7 @@ suboption ()
 	if (SB_EOF () || SB_GET () != TELQUAL_IS)
 	  return;		/* ??? XXX but, this is the most robust */
 
-	if (terminaltype)
-	  free (terminaltype);
+	free (terminaltype);
 
 	obstack_init (&stk);
 	while (!SB_EOF ())
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 58edcb6..800e104 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -760,14 +760,12 @@ getterminaltype (char *user_name)
        */
       if (his_state_is_will (TELOPT_TTYPE) && !terminaltypeok (terminaltype))
 	{
-	  if (first)
-	    free (first);
+	  free (first);
 	  first = xstrdup (terminaltype);
 	  for (;;)
 	    {
 	      /* Save the unknown name, and request the next name. */
-	      if (last)
-		free (last);
+	      free (last);
 	      last = xstrdup (terminaltype);
 	      _gettermname ();
 	      if (terminaltypeok (terminaltype))
@@ -796,10 +794,8 @@ getterminaltype (char *user_name)
 		}
 	    }
 	}
-      if (first)
-	free (first);
-      if (last)
-	free (last);
+      free (first);
+      free (last);
     }
   return retval;
 }
diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c
index fdf1a23..dcec421 100644
--- a/tftpd/tftpd.c
+++ b/tftpd/tftpd.c
@@ -466,8 +466,7 @@ validate_access (char **filep, int mode)
       err = ENOTFOUND;
       for (dirp = dirs; dirp->name != NULL; dirp++)
 	{
-	  if (pathname)
-	    free (pathname);
+	  free (pathname);
 	  pathname = malloc (strlen (dirp->name) + 1 + strlen (filename) + 1);
 	  if (!pathname)
 	    return ENOMEM;

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

Summary of changes:
 ChangeLog             |   27 ++++++++++++++++++++++
 doc/inetutils.texi    |    3 +-
 ftp/cmds.c            |    9 ++-----
 ftp/ftp.c             |   18 +++++---------
 ftp/ruserpass.c       |    8 ++----
 ftpd/auth.c           |   18 +++++---------
 ftpd/ftpcmd.y         |   60 ++++++++++++++++--------------------------------
 ftpd/ftpd.c           |   28 +++++++---------------
 ftpd/pam.c            |    6 +---
 ifconfig/if_index.c   |    3 +-
 inetd/inetd.c         |   18 +++++---------
 libinetutils/argcv.c  |    3 +-
 libls/fts.c           |    6 +---
 libtelnet/kerberos5.c |    6 +---
 libtelnet/misc.c      |   10 ++-----
 syslogd/syslogd.c     |    6 +---
 telnet/commands.c     |   15 ++++--------
 telnetd/state.c       |    3 +-
 telnetd/utility.c     |   12 +++------
 tftpd/tftpd.c         |    3 +-
 20 files changed, 105 insertions(+), 157 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sat Nov 14 09:49:01 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9Jvx-0006Gd-Kf
	for mharc-commit-inetutils@gnu.org; Sat, 14 Nov 2009 09:49:01 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9Jvv-0006GN-Kj
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 09:48:59 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9Jvu-0006G3-Gv
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 09:48:59 -0500
Received: from [199.232.76.173] (port=56635 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9Jvu-0006G0-BS
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 09:48:58 -0500
Received: from savannah.gnu.org ([199.232.41.3]:47873 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 1N9Jvu-0005Fl-0t
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 09:48:58 -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 1N9Jvt-0006IT-4K
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 14:48:57 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <ams@savannah.gnu.org>) id 1N9Jvs-0006I1-Pp
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 14:48:57 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b033f20780fde4507c77a9c4ac6c23c780cc3609
X-Git-Newrev: 64464df48ecf2506110b56c2961e453ef5869f76
Message-Id: <E1N9Jvs-0006I1-Pp@cvs.savannah.gnu.org>
From: "Alfred M. Szmidt" <ams@gnu.org>
Date: Sat, 14 Nov 2009 14:48:56 +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_6-90-g64464df
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, 14 Nov 2009 14:49: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  64464df48ecf2506110b56c2961e453ef5869f76 (commit)
      from  b033f20780fde4507c77a9c4ac6c23c780cc3609 (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=64464df48ecf2506110b56c2961e453ef5869f76


commit 64464df48ecf2506110b56c2961e453ef5869f76
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Nov 14 15:54:42 2009 +0100

    configure.ac: Bump version number to 1.6.90.

diff --git a/ChangeLog b/ChangeLog
index 09d4b0e..cfd079a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
 
+	* configure.ac: Bump version number to 1.6.90.
+
+2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
+
 	* ftp/cmds.c (ls, setnmap): Fix syntax-check
 	sc_avoid_if_before_free.
 
diff --git a/configure.ac b/configure.ac
index 57b254a..65d6e16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT([GNU inetutils], [1.6.90], [bug-inetutils@gnu.org])
+AC_INIT([GNU inetutils], [1.6.91], [bug-inetutils@gnu.org])
 
 AC_CONFIG_SRCDIR([inetd/inetd.c])
 AC_CONFIG_AUX_DIR([build-aux])

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

Summary of changes:
 ChangeLog    |    4 ++++
 configure.ac |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sat Nov 14 10:56:24 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9Kz9-0001cr-Rj
	for mharc-commit-inetutils@gnu.org; Sat, 14 Nov 2009 10:56:23 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9Kz8-0001cR-Cq
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 10:56:22 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9Kz7-0001c9-M4
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 10:56:22 -0500
Received: from [199.232.76.173] (port=44224 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9Kz7-0001c6-GK
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 10:56:21 -0500
Received: from savannah.gnu.org ([199.232.41.3]:48270 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 1N9Kz7-0008Da-6K
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 10:56:21 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <simon@josefsson.org>) id 1N9Kz6-0001jm-E0
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 15:56:20 +0000
Received: from jas by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1N9Kz3-0001jB-NL
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 15:56:19 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 64464df48ecf2506110b56c2961e453ef5869f76
X-Git-Newrev: 30daf3e3be20739c3f78e2bf5663b479796e2b59
Message-Id: <E1N9Kz3-0001jB-NL@cvs.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Sat, 14 Nov 2009 15:56:17 +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_6-91-g30daf3e
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, 14 Nov 2009 15:56:22 -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  30daf3e3be20739c3f78e2bf5663b479796e2b59 (commit)
      from  64464df48ecf2506110b56c2961e453ef5869f76 (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=30daf3e3be20739c3f78e2bf5663b479796e2b59


commit 30daf3e3be20739c3f78e2bf5663b479796e2b59
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Nov 14 16:56:12 2009 +0100

    Fix sc_error_message_uppercase error.

diff --git a/ChangeLog b/ChangeLog
index cfd079a..1eda8e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-14  Simon Josefsson  <simon@josefsson.org>
+
+	* libinetutils/daemon.c: Doc fix.
+
 2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
 
 	* configure.ac: Bump version number to 1.6.90.
diff --git a/libinetutils/daemon.c b/libinetutils/daemon.c
index 44fa337..f07044e 100644
--- a/libinetutils/daemon.c
+++ b/libinetutils/daemon.c
@@ -75,7 +75,7 @@
 
   4.chdir("/") to ensure that our process doesn't keep any directory in use.
   Failure to do this could make it so that an administrator couldn't unmount
-  a filesystem, because it was our current directory.
+  a file system, because it was our current directory.
   [Equivalently, we could change to any directory containing files important
   to the daemon's operation.]
 

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

Summary of changes:
 ChangeLog             |    4 ++++
 libinetutils/daemon.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sat Nov 14 11:37:39 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9Ld5-0005VE-El
	for mharc-commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:37:39 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9Ld3-0005V0-RU
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:37:37 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9Ld2-0005Ug-OK
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:37:37 -0500
Received: from [199.232.76.173] (port=45818 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9Ld2-0005Ud-Kp
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:37:36 -0500
Received: from savannah.gnu.org ([199.232.41.3]:57764 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 1N9Ld2-00062Z-Am
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:37:36 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <simon@josefsson.org>) id 1N9Ld1-0004LZ-Jq
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 16:37:35 +0000
Received: from jas by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1N9Ld1-0004Kb-9f
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 16:37:35 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 30daf3e3be20739c3f78e2bf5663b479796e2b59
X-Git-Newrev: f5402bc6eb50e263087ff5c9f2c4e0275b5b7dd1
Message-Id: <E1N9Ld1-0004Kb-9f@cvs.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Sat, 14 Nov 2009 16:37:35 +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_6-92-gf5402bc
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, 14 Nov 2009 16:37:38 -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  f5402bc6eb50e263087ff5c9f2c4e0275b5b7dd1 (commit)
      from  30daf3e3be20739c3f78e2bf5663b479796e2b59 (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=f5402bc6eb50e263087ff5c9f2c4e0275b5b7dd1


commit f5402bc6eb50e263087ff5c9f2c4e0275b5b7dd1
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Nov 14 17:37:31 2009 +0100

    Drop replacement of S_ISTXT, we use gnulib.

diff --git a/ChangeLog b/ChangeLog
index 1eda8e1..b7a39ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-14  Simon Josefsson  <simon@josefsson.org>
 
+	* rcp/rcp.c: Drop replacement of S_ISTXT, we use gnulib.
+
+2009-11-14  Simon Josefsson  <simon@josefsson.org>
+
 	* libinetutils/daemon.c: Doc fix.
 
 2009-11-14  Alfred M. Szmidt  <ams@gnu.org>
diff --git a/rcp/rcp.c b/rcp/rcp.c
index e838b5e..34af034 100644
--- a/rcp/rcp.c
+++ b/rcp/rcp.c
@@ -124,10 +124,6 @@ int doencrypt = 0;
 # endif
 #endif /* KERBEROS  */
 
-#if !defined (S_ISTXT) && defined (S_ISVTX)
-# define S_ISTXT S_ISVTX
-#endif
-
 const char doc[] = "Remote copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.";
 const char arg_doc[] = "SOURCE DEST\n"
                        "SOURCE... DIRECTORY\n"

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

Summary of changes:
 ChangeLog |    4 ++++
 rcp/rcp.c |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sat Nov 14 11:58:20 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9Lx5-00044L-VO
	for mharc-commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:58:20 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9Lx4-00044G-J1
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:58:18 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9Lx2-00043o-7V
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:58:17 -0500
Received: from [199.232.76.173] (port=48267 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9Lx2-00043l-3b
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:58:16 -0500
Received: from savannah.gnu.org ([199.232.41.3]:46905 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 1N9Lx1-0000a4-Jp
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:58:15 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <simon@josefsson.org>) id 1N9Lx0-0005Lm-K1
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 16:58:14 +0000
Received: from jas by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1N9Lx0-0005LG-6T
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 16:58:14 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f5402bc6eb50e263087ff5c9f2c4e0275b5b7dd1
X-Git-Newrev: d3ab39aecbfa6e10622e59263d4620fa490cf40c
Message-Id: <E1N9Lx0-0005LG-6T@cvs.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Sat, 14 Nov 2009 16:58:14 +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_6-94-gd3ab39a
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, 14 Nov 2009 16:58:19 -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  d3ab39aecbfa6e10622e59263d4620fa490cf40c (commit)
       via  1cad30e67013374684b094c56ab487a7df241adf (commit)
      from  f5402bc6eb50e263087ff5c9f2c4e0275b5b7dd1 (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=d3ab39aecbfa6e10622e59263d4620fa490cf40c


commit d3ab39aecbfa6e10622e59263d4620fa490cf40c
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Nov 14 17:58:06 2009 +0100

    rcp/rcp.c (RCP_MODEMASK): Use S_ISVTX instead of S_ISTXT.

diff --git a/ChangeLog b/ChangeLog
index 7a4ea2a..97320f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-14  Simon Josefsson  <simon@josefsson.org>
 
+	* rcp/rcp.c (RCP_MODEMASK): Use S_ISVTX instead of S_ISTXT.
+
+2009-11-14  Simon Josefsson  <simon@josefsson.org>
+
 	* ifconfig/system.c: Include config.h properly.
 	* libinetutils/argcv.c: Likewise.
 	* libinetutils/defauthors.c: Likewise.
diff --git a/rcp/rcp.c b/rcp/rcp.c
index 34af034..48aaa52 100644
--- a/rcp/rcp.c
+++ b/rcp/rcp.c
@@ -585,7 +585,7 @@ source (int argc, char *argv[])
 	  if (response () < 0)
 	    goto next;
 	}
-#define RCP_MODEMASK	(S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)
+#define RCP_MODEMASK	(S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)
       snprintf (buf, sizeof buf,
 		(sizeof (stb.st_size) > sizeof (long)
 		 ? "C%04o %qd %s\n"

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


commit d3ab39aecbfa6e10622e59263d4620fa490cf40c
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Nov 14 17:58:06 2009 +0100

    rcp/rcp.c (RCP_MODEMASK): Use S_ISVTX instead of S_ISTXT.

diff --git a/ChangeLog b/ChangeLog
index 7a4ea2a..97320f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-14  Simon Josefsson  <simon@josefsson.org>
 
+	* rcp/rcp.c (RCP_MODEMASK): Use S_ISVTX instead of S_ISTXT.
+
+2009-11-14  Simon Josefsson  <simon@josefsson.org>
+
 	* ifconfig/system.c: Include config.h properly.
 	* libinetutils/argcv.c: Likewise.
 	* libinetutils/defauthors.c: Likewise.
diff --git a/rcp/rcp.c b/rcp/rcp.c
index 34af034..48aaa52 100644
--- a/rcp/rcp.c
+++ b/rcp/rcp.c
@@ -585,7 +585,7 @@ source (int argc, char *argv[])
 	  if (response () < 0)
 	    goto next;
 	}
-#define RCP_MODEMASK	(S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)
+#define RCP_MODEMASK	(S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)
       snprintf (buf, sizeof buf,
 		(sizeof (stb.st_size) > sizeof (long)
 		 ? "C%04o %qd %s\n"

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

Summary of changes:
 ChangeLog                 |   27 +++++++++++++++++++++++++++
 ifconfig/system.c         |    2 ++
 libinetutils/argcv.c      |    2 ++
 libinetutils/defauthors.c |    2 ++
 libinetutils/logwtmpko.c  |    2 ++
 libtelnet/forward.c       |    2 ++
 rcp/rcp.c                 |    2 +-
 talk/init_disp.c          |    6 ++----
 talkd/acl.c               |    2 ++
 talkd/announce.c          |    2 ++
 talkd/print.c             |    2 ++
 talkd/process.c           |    2 ++
 talkd/table.c             |    2 ++
 telnet/ring.c             |    6 ++----
 telnetd/pty.c             |    2 ++
 telnetd/slc.c             |    2 ++
 telnetd/state.c           |    2 ++
 telnetd/telnetd.c         |    2 ++
 telnetd/term.c            |    2 ++
 telnetd/termstat.c        |    2 ++
 telnetd/utility.c         |    2 ++
 tests/localhost.c         |    2 ++
 22 files changed, 68 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sat Nov 14 12:08:44 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9M79-0000CT-Tw
	for mharc-commit-inetutils@gnu.org; Sat, 14 Nov 2009 12:08:43 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9M78-0000BM-1f
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 12:08:42 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9M77-0000Ay-Ca
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 12:08:41 -0500
Received: from [199.232.76.173] (port=39585 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9M77-0000Ai-6C
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 12:08:41 -0500
Received: from savannah.gnu.org ([199.232.41.3]:42930 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 1N9M76-00022w-Ow
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 12:08:40 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <simon@josefsson.org>) id 1N9M75-0005wU-VL
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 17:08:40 +0000
Received: from jas by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1N9M75-0005w2-NC
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 17:08:39 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d3ab39aecbfa6e10622e59263d4620fa490cf40c
X-Git-Newrev: 78161cfc59c4491866a79f5de52167b572dbeb27
Message-Id: <E1N9M75-0005w2-NC@cvs.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Sat, 14 Nov 2009 17:08: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_6-95-g78161cf
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, 14 Nov 2009 17:08:42 -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  78161cfc59c4491866a79f5de52167b572dbeb27 (commit)
      from  d3ab39aecbfa6e10622e59263d4620fa490cf40c (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=78161cfc59c4491866a79f5de52167b572dbeb27


commit 78161cfc59c4491866a79f5de52167b572dbeb27
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sat Nov 14 18:08:36 2009 +0100

    cfg.mk: Ignore failing tests.

diff --git a/ChangeLog b/ChangeLog
index 97320f2..dc26f62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-14  Simon Josefsson  <simon@josefsson.org>
 
+	* cfg.mk: Ignore failing tests, please revisit later.
+
+2009-11-14  Simon Josefsson  <simon@josefsson.org>
+
 	* rcp/rcp.c (RCP_MODEMASK): Use S_ISVTX instead of S_ISTXT.
 
 2009-11-14  Simon Josefsson  <simon@josefsson.org>
diff --git a/cfg.mk b/cfg.mk
index 6cfdbb9..dda6c6d 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -16,6 +16,26 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
+local-checks-to-skip = \
+	sc_error_message_period \
+	sc_error_message_uppercase \
+	sc_immutable_NEWS \
+	sc_m4_quote_check \
+	sc_obsolete_symbols \
+	sc_program_name \
+	sc_prohibit_assert_without_use \
+	sc_prohibit_atoi_atof \
+	sc_prohibit_have_config_h \
+	sc_prohibit_magic_number_exit \
+	sc_prohibit_signal_without_use \
+	sc_prohibit_stat_st_blocks \
+	sc_prohibit_strcmp \
+	sc_space_tab \
+	sc_trailing_blank \
+	sc_unmarked_diagnostics \
+	sc_useless_cpp_parens \
+	sc_makefile_check
+
 htmldir = ../www-$(PACKAGE)
 
 web-coverage:

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

Summary of changes:
 ChangeLog |    4 ++++
 cfg.mk    |   20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sun Nov 15 15:52:25 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9m5B-0004AI-8Q
	for mharc-commit-inetutils@gnu.org; Sun, 15 Nov 2009 15:52:25 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9m59-00049y-GQ
	for commit-inetutils@gnu.org; Sun, 15 Nov 2009 15:52:23 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9m58-00049g-2O
	for commit-inetutils@gnu.org; Sun, 15 Nov 2009 15:52:23 -0500
Received: from [199.232.76.173] (port=45357 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9m57-00049d-VW
	for commit-inetutils@gnu.org; Sun, 15 Nov 2009 15:52:22 -0500
Received: from savannah.gnu.org ([199.232.41.3]:37286 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 1N9m57-0001z5-0l
	for commit-inetutils@gnu.org; Sun, 15 Nov 2009 15:52:21 -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 1N9m56-0002Dn-4i
	for commit-inetutils@gnu.org; Sun, 15 Nov 2009 20:52:20 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <ams@savannah.gnu.org>) id 1N9m55-0002DG-NM
	for commit-inetutils@gnu.org; Sun, 15 Nov 2009 20:52:20 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 78161cfc59c4491866a79f5de52167b572dbeb27
X-Git-Newrev: 580a9e8db4453305c75ae20435da3a09d74d2104
Message-Id: <E1N9m55-0002DG-NM@cvs.savannah.gnu.org>
From: "Alfred M. Szmidt" <ams@gnu.org>
Date: Sun, 15 Nov 2009 20:52:19 +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_6-98-g580a9e8
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: Sun, 15 Nov 2009 20:52: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  580a9e8db4453305c75ae20435da3a09d74d2104 (commit)
       via  f3fb446b2c0066ebc6a46fda6dc22db7f4905b79 (commit)
       via  e7440293e6eb3bd478fb098a88e13049fda409d6 (commit)
      from  78161cfc59c4491866a79f5de52167b572dbeb27 (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=580a9e8db4453305c75ae20435da3a09d74d2104


commit 580a9e8db4453305c75ae20435da3a09d74d2104
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Nov 15 21:57:10 2009 +0100

    Fixed a few sc_m4_quote_check errors.

diff --git a/ChangeLog b/ChangeLog
index d4d2d1a..310b651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-11-15  Alfred M. Szmidt  <ams@gnu.org>
 
+	* configure.ac: Quote first argument in AC_DEFINE macro
+	calls. (fixes sc_m4_quote_check)
+	* am/config_paths.m4: Likewise.
+	* am/check_weak_refs.m4: Likewise.
+
+2009-11-15  Alfred M. Szmidt  <ams@gnu.org>
+
 	* libtelnet/shishi.c: Don't include
 	<assert.h> (fixes prohibit_assert_without_use).
 
diff --git a/am/check_weak_refs.m4 b/am/check_weak_refs.m4
index dd1f73f..b80ac59 100644
--- a/am/check_weak_refs.m4
+++ b/am/check_weak_refs.m4
@@ -37,8 +37,8 @@ AC_DEFUN([IU_CHECK_WEAK_REFS], [
       [inetutils_cv_attr_weak_refs=yes],
       [inetutils_cv_attr_weak_refs=no]))
   if test "$inetutils_cv_weak_refs" = yes; then
-    AC_DEFINE(HAVE_WEAK_REFS)
-    AC_DEFINE(HAVE_ATTR_WEAK_REFS, 1,
+    AC_DEFINE([HAVE_WEAK_REFS])
+    AC_DEFINE([HAVE_ATTR_WEAK_REFS], 1,
               [Define if you have weak "attribute" references])
   else
     AC_CACHE_CHECK(whether pragma weak references work,
@@ -50,8 +50,8 @@ AC_DEFUN([IU_CHECK_WEAK_REFS], [
 	[inetutils_cv_pragma_weak_refs=yes],
 	[inetutils_cv_pragma_weak_refs=no]))
     if test "$inetutils_cv_pragma_weak_refs" = yes; then
-      AC_DEFINE(HAVE_WEAK_REFS)
-      AC_DEFINE(HAVE_PRAGMA_WEAK_REFS, 1,
+      AC_DEFINE([HAVE_WEAK_REFS])
+      AC_DEFINE([HAVE_PRAGMA_WEAK_REFS], 1,
                 [Define if you have weak "pragma" references])
     else
       AC_CACHE_CHECK(whether asm weak references work,
@@ -63,8 +63,8 @@ AC_DEFUN([IU_CHECK_WEAK_REFS], [
 	  [inetutils_cv_asm_weak_refs=yes],
 	  [inetutils_cv_asm_weak_refs=no]))
       if test "$inetutils_cv_asm_weak_refs" = yes; then
-	AC_DEFINE(HAVE_WEAK_REFS)
-	AC_DEFINE(HAVE_ASM_WEAK_REFS, 1,
+	AC_DEFINE([HAVE_WEAK_REFS])
+	AC_DEFINE([HAVE_ASM_WEAK_REFS], 1,
 	          [Define if you have weak "assembler" references])
       fi
     fi
diff --git a/am/config_paths.m4 b/am/config_paths.m4
index 07fdca4..b7d1bed 100644
--- a/am/config_paths.m4
+++ b/am/config_paths.m4
@@ -38,7 +38,7 @@ AC_DEFUN([IU_CONFIG_PATHS], [
   dnl We need to know if we're cross compiling.
   AC_REQUIRE([AC_PROG_CC])
 
-  AC_CHECK_HEADER(paths.h, AC_DEFINE(HAVE_PATHS_H, 1,
+  AC_CHECK_HEADER(paths.h, AC_DEFINE([HAVE_PATHS_H], 1,
         [Define if you have the <paths.h> header file]) iu_paths_h="<paths.h>")
 
   dnl A slightly bogus use of AC_ARG_WITH; we never actually use
diff --git a/configure.ac b/configure.ac
index 65d6e16..736e849 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,7 +151,7 @@ IU_LIB_TERMCAP
 #AC_CHECK_LIB(readline, rl_bind_key,,, -ltermcap)
 AC_CHECK_LIB(readline, rl_bind_key,
              [LIBREADLINE=-lreadline
-              AC_DEFINE(HAVE_LIBREADLINE, 1,
+              AC_DEFINE([HAVE_LIBREADLINE], 1,
 	           [Define to one if you have -lreadline])],
              [LIBREADLINE=], "$LIBTERMCAP")
 AC_SUBST(LIBREADLINE)
@@ -159,7 +159,7 @@ AC_SUBST(LIBTERMCAP)
 
 AC_CHECK_LIB(history, add_history,
              [LIBHISTORY=-lhistory
-              AC_DEFINE(HAVE_LIBHISTORY, 1,
+              AC_DEFINE([HAVE_LIBHISTORY], 1,
 	           [Define to one if you have -lhistory])],
              [LIBHISTORY=])
 
@@ -167,7 +167,7 @@ AC_CHECK_LIB(history, add_history,
 if test -z "$LIBHISTORY" && test -n "$LIBREADLINE"; then
   AC_CHECK_LIB(readline, add_history,
                [LIBHISTORY=-lreadline
-                AC_DEFINE(HAVE_LIBHISTORY, 1,
+                AC_DEFINE([HAVE_LIBHISTORY], 1,
                      [Define to one if you have -lhistory])],
                [LIBHISTORY=])
 fi
@@ -191,7 +191,7 @@ if test "$with_pam" = yes ; then
   AC_CHECK_LIB(dl, dlopen)
   AC_CHECK_LIB(pam, pam_authenticate, LIBPAM=-lpam)
   if test "$ac_cv_lib_pam_pam_authenticate" = yes ; then
-     AC_DEFINE(WITH_PAM, 1, [Define to one if you have -lpam.])
+     AC_DEFINE([WITH_PAM], 1, [Define to one if you have -lpam.])
   fi
 fi
 AC_SUBST(LIBPAM)
@@ -200,7 +200,7 @@ AC_SUBST(LIBPAM)
 if test "$enable_libls" = yes  -a "$ac_cv_func_fchdir" = yes ; then
   LIBLS="../libls/libls.a"
   libls_BUILD="libls.a"
-  AC_DEFINE(WITH_LIBLS, 1, [Define to one if you have -lls])
+  AC_DEFINE([WITH_LIBLS], 1, [Define to one if you have -lls])
 else
   LIBLS=''
   libls_BUILD=''
@@ -235,8 +235,8 @@ if test "$enable_encryption" = yes -o "$enable_authentication" = yes; then
   case $KERBEROS_VERSION in
   4)
     AC_CHECK_LIB(krb, krb_mk_req,
-                 [LIBAUTH=-lkrb
-                  AC_DEFINE(KRB4)],
+                 LIBAUTH=-lkrb
+                  AC_DEFINE([KRB4]),
                  -L$KERBEROS_DIR)
     if test ".$LIBAUTH" != . ; then
       AC_CHECK_LIB(des, des_key_sched,
@@ -244,11 +244,11 @@ if test "$enable_encryption" = yes -o "$enable_authentication" = yes; then
                    -L$KERBEROS_DIR)
       dnl FIXME: Fix this to one test case.
       test "$enable_authentication" = yes -a "$ac_cv_lib_krb_krb_mk_req" = yes\
-  && AC_DEFINE(KRB4)
+  && AC_DEFINE([KRB4])
       test "$enable_authentication" = yes -a "$ac_cv_lib_krb_krb_mk_req" = yes \
-  && AC_DEFINE(KERBEROS)
+  && AC_DEFINE([KERBEROS])
       test "$enable_encryption" = yes -a "$ac_cv_lib_des_des_key_sched" = yes \
-        && AC_DEFINE(DES_ENCRYPTION)
+        && AC_DEFINE([DES_ENCRYPTION])
     fi
     ;;
   5)
@@ -256,8 +256,8 @@ if test "$enable_encryption" = yes -o "$enable_authentication" = yes; then
     LIBAUTH="$KRB5_LIBS" # FIXME
     INCAUTH=$KRB5_CFLAGS
     if test ".$LIBAUTH" != . ;then
-      AC_DEFINE(KERBEROS)
-      AC_DEFINE(KRB5)
+      AC_DEFINE([KERBEROS])
+      AC_DEFINE([KRB5])
     fi
     ;;
   *)
@@ -272,7 +272,7 @@ if test "$enable_encryption" = yes -o "$enable_authentication" = yes; then
     CPPFLAGS="$CPPFLAGS $INCAUTH"
     AC_CHECK_HEADER(shishi.h,
       AC_CHECK_LIB(shishi, shishi_check_version,
-        AC_DEFINE(SHISHI),
+        AC_DEFINE([SHISHI]),
         [INCAUTH= LIBAUTH=]))
     LIBS=$save_LIBS
     CPPFLAGS=$save_CPPFLAGS
@@ -283,9 +283,9 @@ AC_SUBST(INCAUTH)
 
 dnl Define CPP macros that enable auth/encrypt code
 if test ".$LIBAUTH" != .; then
-  test "$enable_authentication" = yes && AC_DEFINE(AUTHENTICATION, 1,
+  test "$enable_authentication" = yes && AC_DEFINE([AUTHENTICATION], 1,
                    [Define to one if you want authentication.])
-  test "$enable_encryption" = yes     && AC_DEFINE(ENCRYPTION, 1,
+  test "$enable_encryption" = yes     && AC_DEFINE([ENCRYPTION], 1,
                    [Define to one if you want encryption.])
 fi
 
@@ -328,16 +328,16 @@ fi
 
 AH_TEMPLATE([HAVE_GETADDRINFO],[Define to 1 if you have getaddrinfo(3)])
 AC_CHECK_FUNC(getaddrinfo,
-              [AC_DEFINE(HAVE_GETADDRINFO,1)],
+              [AC_DEFINE([HAVE_GETADDRINFO],1)],
 	      [working_ipv6=no
-	       AC_DEFINE(HAVE_GETADDRINFO,0)], [#include <netdb.h>])
+	       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
 
 if test ! "X$ipv6" = "Xno" -a "X$working_ipv6" = "Xyes"; then
-  AC_DEFINE(IPV6, 1, [Define to one if you want IPv6.])
+  AC_DEFINE([IPV6], 1, [Define to one if you want IPv6.])
 else 
   if test "X$ipv6" = "Xyes"; then
     AC_MSG_FAILURE([IPv6 support not available])
@@ -394,7 +394,7 @@ else
     		   [have_recvhoplimt=yes], [have_recvhoplimt=no])
     if test "X$have_recvhoplimt" = "Xno"; then
       IU_CHECK_MACRO(IPV6_HOPLIMIT, [#include <netinet/in.h>], , [
-        AC_DEFINE(IPV6_RECVHOPLIMIT, IPV6_HOPLIMIT,
+        AC_DEFINE([IPV6_RECVHOPLIMIT], IPV6_HOPLIMIT,
                   [Define to IPV6_HOPLIMIT if not available])
       ], [working_icmp6=no])
     fi
@@ -411,7 +411,7 @@ else
     		   [have_beyondscope=yes], [have_beyondscope=no])
     if test "X$have_beyondscope" = "Xno"; then
       IU_CHECK_MACRO(ICMP6_DST_UNREACH_NOTNEIGHBOR, [#include <netinet/icmp6.h>], , [
-        AC_DEFINE(ICMP6_DST_UNREACH_BEYONDSCOPE, ICMP6_DST_UNREACH_NOTNEIGHBOR,
+        AC_DEFINE([ICMP6_DST_UNREACH_BEYONDSCOPE], ICMP6_DST_UNREACH_NOTNEIGHBOR,
                   [Define to ICMP6_DST_UNREACH_NOTNEIGHBOR if not available])
       ], [working_icmp6=no])
     fi
@@ -440,7 +440,7 @@ dnl you have to define some global variables
               eval "ac_cv_lib_wrap_hosts_ctl=no")
   LIBS=$save_LIBS
   if test "$ac_cv_lib_wrap_hosts_ctl" = yes ; then
-    AC_DEFINE(WITH_WRAP, 1, [Define to one if you have -lwrap.])
+    AC_DEFINE([WITH_WRAP], 1, [Define to one if you have -lwrap.])
     LIBWRAP=-lwrap
   fi
   AC_MSG_RESULT($ac_cv_lib_wrap_hosts_ctl);
@@ -485,7 +485,7 @@ dnl Checks return type of signal handlers
 AC_TYPE_SIGNAL
 
 AC_CHECK_TYPE(socklen_t, ,
-              [AC_DEFINE(socklen_t, int,
+              [AC_DEFINE([socklen_t], int,
                          [Define to int if <sys/types.h> does not define])],
               [IU_FLUSHLEFT([#include <sys/types.h>
 	                     #include <sys/socket.h>])])
@@ -493,7 +493,7 @@ AC_CHECK_TYPE(socklen_t, ,
 dnl We may need our own definition for struct osockaddr (equivalent to the
 dnl old 4.3BSD struct sockaddr, and used in grotty bsd talk protocol)
 AC_CHECK_TYPE(struct osockaddr, ,
-              [AC_DEFINE(HAVE_OSOCKADDR_H, 1,
+              [AC_DEFINE([HAVE_OSOCKADDR_H], 1,
                          [Define to one if you have <osockaddr.h>.])],
 	      [IU_FLUSHLEFT([#include <sys/types.h>
                              #include <sys/socket.h> ])])
@@ -509,16 +509,16 @@ AC_CHECK_TYPES(sig_t, , ,
                  #include <signal.h> ])])
 
 dnl sigset_t is a set of signals (4.4BSD)
-AC_CHECK_TYPE(sigset_t, , AC_DEFINE(sigset_t, unsigned long, [FIXME]),
+AC_CHECK_TYPE(sigset_t, , AC_DEFINE([sigset_t], unsigned long, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #include <signal.h> ])])
 
 dnl I'm not sure what this is, but netbsd has it; just use int if necessary.
-AC_CHECK_TYPE(sig_atomic_t, , AC_DEFINE(sig_atomic_t, int, [FIXME]),
+AC_CHECK_TYPE(sig_atomic_t, , AC_DEFINE([sig_atomic_t], int, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #include <signal.h> ])])
 
-AC_CHECK_TYPE(sa_family_t, , AC_DEFINE(sa_family_t, unsigned int, [FIXME]),
+AC_CHECK_TYPE(sa_family_t, , AC_DEFINE([sa_family_t], unsigned int, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #ifdef HAVE_SOCKET_H
                  #include <socket.h>
@@ -536,8 +536,8 @@ AC_CHECK_TYPES(cc_t, , ,
                 #endif ])])
 
 dnl Check for compile support for ceratin type
-AC_CHECK_TYPE(long long, , AC_DEFINE(LONG_LONG, long, [Define to long if compiler does not support]))
-AC_CHECK_TYPE(long double, , AC_DEFINE(LONG_DOUBLE, double, [Define to double if compiler does not support]))
+AC_CHECK_TYPE(long long, , AC_DEFINE([LONG_LONG], long, [Define to long if compiler does not support]))
+AC_CHECK_TYPE(long double, , AC_DEFINE([LONG_DOUBLE], double, [Define to double if compiler does not support]))
 
 ### Checks for structures.
 IU_CHECK_MEMBERS([struct sockaddr_in.sin_len], , ,
@@ -616,7 +616,7 @@ LIBS="$_SAVE_LIBS"
 AC_CHECK_FUNC(_obstack_free)
 
 dnl Use (posix) `setpgid' if it's around, otherwise assume a BSD setpgrp
-AC_CHECK_FUNC(setpgid, , AC_DEFINE(setpgid, setpgrp,
+AC_CHECK_FUNC(setpgid, , AC_DEFINE([setpgid], setpgrp,
                           [Define to `setpgrp' if you don't have `setpgid'.]))
 
 dnl We use our own version of getopt (including our own header file) if the
@@ -628,21 +628,21 @@ AC_CHECK_HEADER(poll.h)
 dnl Supply a version of poll() if the libray is missing.
 dnl syslogd uses poll() unconditionnaly.
 AC_CHECK_FUNC(poll, ,
-  [AC_DEFINE(HAVE_POLL_H, 1, [Define to one if you have <poll.h>])])
+  [AC_DEFINE([HAVE_POLL_H], 1, [Define to one if you have <poll.h>])])
 
 dnl See if snprintf exists, otherwise just use a bogus version
 AC_CHECK_FUNC(snprintf,
-  [AC_DEFINE(HAVE_SNPRINTF, 1, [Define to one if you have snprintf])])
+  [AC_DEFINE([HAVE_SNPRINTF], 1, [Define to one if you have snprintf])])
 
 dnl See if vsnprintf exists, otherwise use our own.
 AC_CHECK_FUNC(vsnprintf,
-  [AC_DEFINE(HAVE_VSNPRINTF, 1, [Define to one if you have vsnprintf])])
+  [AC_DEFINE([HAVE_VSNPRINTF], 1, [Define to one if you have vsnprintf])])
 
 dnl See if the system has strerror, and replace it if not
 AC_CHECK_FUNC(strerror)
 if test "$ac_cv_func_strerror" = no; then
   # No strerror, so see if the SYS_ERRLIST variable can be used by ours
-  AC_CHECK_FUNC(sys_errlist, AC_DEFINE(HAVE_SYS_ERRLIST, 1,
+  AC_CHECK_FUNC(sys_errlist, AC_DEFINE([HAVE_SYS_ERRLIST], 1,
                               [Define to one if you have sys_errlist.]))
   if test "$ac_cv_func_sys_errlist" = yes; then
     AC_CHECK_DECL(sys_errlist, , ,
@@ -669,7 +669,7 @@ if test "$ac_cv_func_hstrerror" = yes -o "$ac_cv_func_h_errlist" = yes; then
   # We still provide some definition, regardless, but this allows people to use
   # a reasonable alternative if the situation allows, rather than using a
   # degenerate version that only says `Host lookup error N'.
-  AC_DEFINE(HAVE_HSTRERROR, 1, [Define to one if you have hstrerror.])
+  AC_DEFINE([HAVE_HSTRERROR], 1, [Define to one if you have hstrerror.])
 fi
 
 ## Checks for function declarations.
@@ -680,7 +680,7 @@ AC_CHECK_DECLS(crypt, , , [#include <unistd.h>])
 
 dnl EWOULDBLOCK is more or less the BSD version of posix EAGAIN.
 IU_CHECK_MACRO(EWOULDBLOCK, [#include <errno.h>], , ,
-  AC_DEFINE(EWOULDBLOCK, EAGAIN, 1, [FIXME]))
+  AC_DEFINE([EWOULDBLOCK], EAGAIN, 1, [FIXME]))
 AC_CHECK_DECLS(errno, , , [#include <errno.h>])
 
 dnl See whether <syslog.h> will declare special internal stuff if we define
@@ -695,7 +695,7 @@ IU_CHECK_MACRO(syslog internal macros,
   [LOG_MAKEPRI LOG_PRI LOG_FAC],
   AC_CHECK_TYPE(CODE,
     AC_CHECK_DECL(prioritynames,
-      AC_DEFINE(HAVE_SYSLOG_INTERNAL, 1, [FIXME]),,
+      AC_DEFINE([HAVE_SYSLOG_INTERNAL], 1, [FIXME]),,
       iu_syslog_includes), , iu_syslog_includes),)
 undefine([iu_syslog_includes])
 
@@ -734,7 +734,7 @@ AC_CACHE_CHECK([for h_errno], inetutils_cv_var_h_errno,
 if test "$inetutils_cv_var_h_errno" = yes; then
   dnl FIXME: Isn't this wrong? Shouldn't the declaration check define
   dnl        this if we find h_errno?
-  AC_DEFINE(HAVE_H_ERRNO, 1, [Define to one if you have h_errno.])
+  AC_DEFINE([HAVE_H_ERRNO], 1, [Define to one if you have h_errno.])
   AC_CHECK_DECL(h_errno, , , [#include <netdb.h>])
 fi
 
@@ -747,20 +747,20 @@ IU_CHECK_MACRO(SEEK_ macros,
   :,
   IU_CHECK_MACRO(L_ seek macros,
     [#include <unistd.h>], L_SET L_INCR L_XTND,
-    AC_DEFINE(SEEK_SET, L_SET, [FIXME])
-    AC_DEFINE(SEEK_CUR, L_INCR, [FIXME])
-    AC_DEFINE(SEEK_END, L_XTND, [FIXME]),
-    AC_DEFINE(SEEK_SET, 0, [FIXME])
-    AC_DEFINE(SEEK_CUR, 1, [FIXME])
-    AC_DEFINE(SEEK_END, 2, [FIXME])))
+    AC_DEFINE([SEEK_SET], L_SET, [FIXME])
+    AC_DEFINE([SEEK_CUR], L_INCR, [FIXME])
+    AC_DEFINE([SEEK_END], L_XTND, [FIXME]),
+    AC_DEFINE([SEEK_SET], 0, [FIXME])
+    AC_DEFINE([SEEK_CUR], 1, [FIXME])
+    AC_DEFINE([SEEK_END], 2, [FIXME])))
 
 dnl Look for the posix _FILENO macros; if not found, use the classic unix values.
 IU_CHECK_MACRO(_FILENO macros,
   [#include <unistd.h>], STDIN_FILENO STDOUT_FILENO STDERR_FILENO,
   :,
-  AC_DEFINE(STDIN_FILENO, 0, [FIXME])
-  AC_DEFINE(STDOUT_FILENO, 1, [FIXME])
-  AC_DEFINE(STDERR_FILENO, 2, [FIXME]))
+  AC_DEFINE([STDIN_FILENO], 0, [FIXME])
+  AC_DEFINE([STDOUT_FILENO], 1, [FIXME])
+  AC_DEFINE([STDERR_FILENO], 2, [FIXME]))
 
 dnl See where to find fd_set (bit-vectors for select) manipulation macros.
 IU_CHECK_MACRO(fd_set macros, [#include <sys/types.h>],
@@ -797,13 +797,13 @@ dnl don't have an entry in utmpx.
 dnl Also for some OS they are better handle with STREAMS
 case "$host" in
 *olaris*)
-  AC_DEFINE(SOLARIS, 1, [FIXME])
-  AC_DEFINE(UTMPX, 1, [FIXME])
-  AC_DEFINE(HAVE_STREAMSPTY, 1, [FIXME])
+  AC_DEFINE([SOLARIS], 1, [FIXME])
+  AC_DEFINE([UTMPX], 1, [FIXME])
+  AC_DEFINE([HAVE_STREAMSPTY], 1, [FIXME])
   ;;
 *irix* | *hpux*)
-  AC_DEFINE(UTMPX, 1, [FIXME])
-  AC_DEFINE(UTMPX, 1, [FIXME])
+  AC_DEFINE([UTMPX], 1, [FIXME])
+  AC_DEFINE([UTMPX], 1, [FIXME])
   ;;
 esac
 

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


commit 580a9e8db4453305c75ae20435da3a09d74d2104
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Nov 15 21:57:10 2009 +0100

    Fixed a few sc_m4_quote_check errors.

diff --git a/ChangeLog b/ChangeLog
index d4d2d1a..310b651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-11-15  Alfred M. Szmidt  <ams@gnu.org>
 
+	* configure.ac: Quote first argument in AC_DEFINE macro
+	calls. (fixes sc_m4_quote_check)
+	* am/config_paths.m4: Likewise.
+	* am/check_weak_refs.m4: Likewise.
+
+2009-11-15  Alfred M. Szmidt  <ams@gnu.org>
+
 	* libtelnet/shishi.c: Don't include
 	<assert.h> (fixes prohibit_assert_without_use).
 
diff --git a/am/check_weak_refs.m4 b/am/check_weak_refs.m4
index dd1f73f..b80ac59 100644
--- a/am/check_weak_refs.m4
+++ b/am/check_weak_refs.m4
@@ -37,8 +37,8 @@ AC_DEFUN([IU_CHECK_WEAK_REFS], [
       [inetutils_cv_attr_weak_refs=yes],
       [inetutils_cv_attr_weak_refs=no]))
   if test "$inetutils_cv_weak_refs" = yes; then
-    AC_DEFINE(HAVE_WEAK_REFS)
-    AC_DEFINE(HAVE_ATTR_WEAK_REFS, 1,
+    AC_DEFINE([HAVE_WEAK_REFS])
+    AC_DEFINE([HAVE_ATTR_WEAK_REFS], 1,
               [Define if you have weak "attribute" references])
   else
     AC_CACHE_CHECK(whether pragma weak references work,
@@ -50,8 +50,8 @@ AC_DEFUN([IU_CHECK_WEAK_REFS], [
 	[inetutils_cv_pragma_weak_refs=yes],
 	[inetutils_cv_pragma_weak_refs=no]))
     if test "$inetutils_cv_pragma_weak_refs" = yes; then
-      AC_DEFINE(HAVE_WEAK_REFS)
-      AC_DEFINE(HAVE_PRAGMA_WEAK_REFS, 1,
+      AC_DEFINE([HAVE_WEAK_REFS])
+      AC_DEFINE([HAVE_PRAGMA_WEAK_REFS], 1,
                 [Define if you have weak "pragma" references])
     else
       AC_CACHE_CHECK(whether asm weak references work,
@@ -63,8 +63,8 @@ AC_DEFUN([IU_CHECK_WEAK_REFS], [
 	  [inetutils_cv_asm_weak_refs=yes],
 	  [inetutils_cv_asm_weak_refs=no]))
       if test "$inetutils_cv_asm_weak_refs" = yes; then
-	AC_DEFINE(HAVE_WEAK_REFS)
-	AC_DEFINE(HAVE_ASM_WEAK_REFS, 1,
+	AC_DEFINE([HAVE_WEAK_REFS])
+	AC_DEFINE([HAVE_ASM_WEAK_REFS], 1,
 	          [Define if you have weak "assembler" references])
       fi
     fi
diff --git a/am/config_paths.m4 b/am/config_paths.m4
index 07fdca4..b7d1bed 100644
--- a/am/config_paths.m4
+++ b/am/config_paths.m4
@@ -38,7 +38,7 @@ AC_DEFUN([IU_CONFIG_PATHS], [
   dnl We need to know if we're cross compiling.
   AC_REQUIRE([AC_PROG_CC])
 
-  AC_CHECK_HEADER(paths.h, AC_DEFINE(HAVE_PATHS_H, 1,
+  AC_CHECK_HEADER(paths.h, AC_DEFINE([HAVE_PATHS_H], 1,
         [Define if you have the <paths.h> header file]) iu_paths_h="<paths.h>")
 
   dnl A slightly bogus use of AC_ARG_WITH; we never actually use
diff --git a/configure.ac b/configure.ac
index 65d6e16..736e849 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,7 +151,7 @@ IU_LIB_TERMCAP
 #AC_CHECK_LIB(readline, rl_bind_key,,, -ltermcap)
 AC_CHECK_LIB(readline, rl_bind_key,
              [LIBREADLINE=-lreadline
-              AC_DEFINE(HAVE_LIBREADLINE, 1,
+              AC_DEFINE([HAVE_LIBREADLINE], 1,
 	           [Define to one if you have -lreadline])],
              [LIBREADLINE=], "$LIBTERMCAP")
 AC_SUBST(LIBREADLINE)
@@ -159,7 +159,7 @@ AC_SUBST(LIBTERMCAP)
 
 AC_CHECK_LIB(history, add_history,
              [LIBHISTORY=-lhistory
-              AC_DEFINE(HAVE_LIBHISTORY, 1,
+              AC_DEFINE([HAVE_LIBHISTORY], 1,
 	           [Define to one if you have -lhistory])],
              [LIBHISTORY=])
 
@@ -167,7 +167,7 @@ AC_CHECK_LIB(history, add_history,
 if test -z "$LIBHISTORY" && test -n "$LIBREADLINE"; then
   AC_CHECK_LIB(readline, add_history,
                [LIBHISTORY=-lreadline
-                AC_DEFINE(HAVE_LIBHISTORY, 1,
+                AC_DEFINE([HAVE_LIBHISTORY], 1,
                      [Define to one if you have -lhistory])],
                [LIBHISTORY=])
 fi
@@ -191,7 +191,7 @@ if test "$with_pam" = yes ; then
   AC_CHECK_LIB(dl, dlopen)
   AC_CHECK_LIB(pam, pam_authenticate, LIBPAM=-lpam)
   if test "$ac_cv_lib_pam_pam_authenticate" = yes ; then
-     AC_DEFINE(WITH_PAM, 1, [Define to one if you have -lpam.])
+     AC_DEFINE([WITH_PAM], 1, [Define to one if you have -lpam.])
   fi
 fi
 AC_SUBST(LIBPAM)
@@ -200,7 +200,7 @@ AC_SUBST(LIBPAM)
 if test "$enable_libls" = yes  -a "$ac_cv_func_fchdir" = yes ; then
   LIBLS="../libls/libls.a"
   libls_BUILD="libls.a"
-  AC_DEFINE(WITH_LIBLS, 1, [Define to one if you have -lls])
+  AC_DEFINE([WITH_LIBLS], 1, [Define to one if you have -lls])
 else
   LIBLS=''
   libls_BUILD=''
@@ -235,8 +235,8 @@ if test "$enable_encryption" = yes -o "$enable_authentication" = yes; then
   case $KERBEROS_VERSION in
   4)
     AC_CHECK_LIB(krb, krb_mk_req,
-                 [LIBAUTH=-lkrb
-                  AC_DEFINE(KRB4)],
+                 LIBAUTH=-lkrb
+                  AC_DEFINE([KRB4]),
                  -L$KERBEROS_DIR)
     if test ".$LIBAUTH" != . ; then
       AC_CHECK_LIB(des, des_key_sched,
@@ -244,11 +244,11 @@ if test "$enable_encryption" = yes -o "$enable_authentication" = yes; then
                    -L$KERBEROS_DIR)
       dnl FIXME: Fix this to one test case.
       test "$enable_authentication" = yes -a "$ac_cv_lib_krb_krb_mk_req" = yes\
-  && AC_DEFINE(KRB4)
+  && AC_DEFINE([KRB4])
       test "$enable_authentication" = yes -a "$ac_cv_lib_krb_krb_mk_req" = yes \
-  && AC_DEFINE(KERBEROS)
+  && AC_DEFINE([KERBEROS])
       test "$enable_encryption" = yes -a "$ac_cv_lib_des_des_key_sched" = yes \
-        && AC_DEFINE(DES_ENCRYPTION)
+        && AC_DEFINE([DES_ENCRYPTION])
     fi
     ;;
   5)
@@ -256,8 +256,8 @@ if test "$enable_encryption" = yes -o "$enable_authentication" = yes; then
     LIBAUTH="$KRB5_LIBS" # FIXME
     INCAUTH=$KRB5_CFLAGS
     if test ".$LIBAUTH" != . ;then
-      AC_DEFINE(KERBEROS)
-      AC_DEFINE(KRB5)
+      AC_DEFINE([KERBEROS])
+      AC_DEFINE([KRB5])
     fi
     ;;
   *)
@@ -272,7 +272,7 @@ if test "$enable_encryption" = yes -o "$enable_authentication" = yes; then
     CPPFLAGS="$CPPFLAGS $INCAUTH"
     AC_CHECK_HEADER(shishi.h,
       AC_CHECK_LIB(shishi, shishi_check_version,
-        AC_DEFINE(SHISHI),
+        AC_DEFINE([SHISHI]),
         [INCAUTH= LIBAUTH=]))
     LIBS=$save_LIBS
     CPPFLAGS=$save_CPPFLAGS
@@ -283,9 +283,9 @@ AC_SUBST(INCAUTH)
 
 dnl Define CPP macros that enable auth/encrypt code
 if test ".$LIBAUTH" != .; then
-  test "$enable_authentication" = yes && AC_DEFINE(AUTHENTICATION, 1,
+  test "$enable_authentication" = yes && AC_DEFINE([AUTHENTICATION], 1,
                    [Define to one if you want authentication.])
-  test "$enable_encryption" = yes     && AC_DEFINE(ENCRYPTION, 1,
+  test "$enable_encryption" = yes     && AC_DEFINE([ENCRYPTION], 1,
                    [Define to one if you want encryption.])
 fi
 
@@ -328,16 +328,16 @@ fi
 
 AH_TEMPLATE([HAVE_GETADDRINFO],[Define to 1 if you have getaddrinfo(3)])
 AC_CHECK_FUNC(getaddrinfo,
-              [AC_DEFINE(HAVE_GETADDRINFO,1)],
+              [AC_DEFINE([HAVE_GETADDRINFO],1)],
 	      [working_ipv6=no
-	       AC_DEFINE(HAVE_GETADDRINFO,0)], [#include <netdb.h>])
+	       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
 
 if test ! "X$ipv6" = "Xno" -a "X$working_ipv6" = "Xyes"; then
-  AC_DEFINE(IPV6, 1, [Define to one if you want IPv6.])
+  AC_DEFINE([IPV6], 1, [Define to one if you want IPv6.])
 else 
   if test "X$ipv6" = "Xyes"; then
     AC_MSG_FAILURE([IPv6 support not available])
@@ -394,7 +394,7 @@ else
     		   [have_recvhoplimt=yes], [have_recvhoplimt=no])
     if test "X$have_recvhoplimt" = "Xno"; then
       IU_CHECK_MACRO(IPV6_HOPLIMIT, [#include <netinet/in.h>], , [
-        AC_DEFINE(IPV6_RECVHOPLIMIT, IPV6_HOPLIMIT,
+        AC_DEFINE([IPV6_RECVHOPLIMIT], IPV6_HOPLIMIT,
                   [Define to IPV6_HOPLIMIT if not available])
       ], [working_icmp6=no])
     fi
@@ -411,7 +411,7 @@ else
     		   [have_beyondscope=yes], [have_beyondscope=no])
     if test "X$have_beyondscope" = "Xno"; then
       IU_CHECK_MACRO(ICMP6_DST_UNREACH_NOTNEIGHBOR, [#include <netinet/icmp6.h>], , [
-        AC_DEFINE(ICMP6_DST_UNREACH_BEYONDSCOPE, ICMP6_DST_UNREACH_NOTNEIGHBOR,
+        AC_DEFINE([ICMP6_DST_UNREACH_BEYONDSCOPE], ICMP6_DST_UNREACH_NOTNEIGHBOR,
                   [Define to ICMP6_DST_UNREACH_NOTNEIGHBOR if not available])
       ], [working_icmp6=no])
     fi
@@ -440,7 +440,7 @@ dnl you have to define some global variables
               eval "ac_cv_lib_wrap_hosts_ctl=no")
   LIBS=$save_LIBS
   if test "$ac_cv_lib_wrap_hosts_ctl" = yes ; then
-    AC_DEFINE(WITH_WRAP, 1, [Define to one if you have -lwrap.])
+    AC_DEFINE([WITH_WRAP], 1, [Define to one if you have -lwrap.])
     LIBWRAP=-lwrap
   fi
   AC_MSG_RESULT($ac_cv_lib_wrap_hosts_ctl);
@@ -485,7 +485,7 @@ dnl Checks return type of signal handlers
 AC_TYPE_SIGNAL
 
 AC_CHECK_TYPE(socklen_t, ,
-              [AC_DEFINE(socklen_t, int,
+              [AC_DEFINE([socklen_t], int,
                          [Define to int if <sys/types.h> does not define])],
               [IU_FLUSHLEFT([#include <sys/types.h>
 	                     #include <sys/socket.h>])])
@@ -493,7 +493,7 @@ AC_CHECK_TYPE(socklen_t, ,
 dnl We may need our own definition for struct osockaddr (equivalent to the
 dnl old 4.3BSD struct sockaddr, and used in grotty bsd talk protocol)
 AC_CHECK_TYPE(struct osockaddr, ,
-              [AC_DEFINE(HAVE_OSOCKADDR_H, 1,
+              [AC_DEFINE([HAVE_OSOCKADDR_H], 1,
                          [Define to one if you have <osockaddr.h>.])],
 	      [IU_FLUSHLEFT([#include <sys/types.h>
                              #include <sys/socket.h> ])])
@@ -509,16 +509,16 @@ AC_CHECK_TYPES(sig_t, , ,
                  #include <signal.h> ])])
 
 dnl sigset_t is a set of signals (4.4BSD)
-AC_CHECK_TYPE(sigset_t, , AC_DEFINE(sigset_t, unsigned long, [FIXME]),
+AC_CHECK_TYPE(sigset_t, , AC_DEFINE([sigset_t], unsigned long, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #include <signal.h> ])])
 
 dnl I'm not sure what this is, but netbsd has it; just use int if necessary.
-AC_CHECK_TYPE(sig_atomic_t, , AC_DEFINE(sig_atomic_t, int, [FIXME]),
+AC_CHECK_TYPE(sig_atomic_t, , AC_DEFINE([sig_atomic_t], int, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #include <signal.h> ])])
 
-AC_CHECK_TYPE(sa_family_t, , AC_DEFINE(sa_family_t, unsigned int, [FIXME]),
+AC_CHECK_TYPE(sa_family_t, , AC_DEFINE([sa_family_t], unsigned int, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #ifdef HAVE_SOCKET_H
                  #include <socket.h>
@@ -536,8 +536,8 @@ AC_CHECK_TYPES(cc_t, , ,
                 #endif ])])
 
 dnl Check for compile support for ceratin type
-AC_CHECK_TYPE(long long, , AC_DEFINE(LONG_LONG, long, [Define to long if compiler does not support]))
-AC_CHECK_TYPE(long double, , AC_DEFINE(LONG_DOUBLE, double, [Define to double if compiler does not support]))
+AC_CHECK_TYPE(long long, , AC_DEFINE([LONG_LONG], long, [Define to long if compiler does not support]))
+AC_CHECK_TYPE(long double, , AC_DEFINE([LONG_DOUBLE], double, [Define to double if compiler does not support]))
 
 ### Checks for structures.
 IU_CHECK_MEMBERS([struct sockaddr_in.sin_len], , ,
@@ -616,7 +616,7 @@ LIBS="$_SAVE_LIBS"
 AC_CHECK_FUNC(_obstack_free)
 
 dnl Use (posix) `setpgid' if it's around, otherwise assume a BSD setpgrp
-AC_CHECK_FUNC(setpgid, , AC_DEFINE(setpgid, setpgrp,
+AC_CHECK_FUNC(setpgid, , AC_DEFINE([setpgid], setpgrp,
                           [Define to `setpgrp' if you don't have `setpgid'.]))
 
 dnl We use our own version of getopt (including our own header file) if the
@@ -628,21 +628,21 @@ AC_CHECK_HEADER(poll.h)
 dnl Supply a version of poll() if the libray is missing.
 dnl syslogd uses poll() unconditionnaly.
 AC_CHECK_FUNC(poll, ,
-  [AC_DEFINE(HAVE_POLL_H, 1, [Define to one if you have <poll.h>])])
+  [AC_DEFINE([HAVE_POLL_H], 1, [Define to one if you have <poll.h>])])
 
 dnl See if snprintf exists, otherwise just use a bogus version
 AC_CHECK_FUNC(snprintf,
-  [AC_DEFINE(HAVE_SNPRINTF, 1, [Define to one if you have snprintf])])
+  [AC_DEFINE([HAVE_SNPRINTF], 1, [Define to one if you have snprintf])])
 
 dnl See if vsnprintf exists, otherwise use our own.
 AC_CHECK_FUNC(vsnprintf,
-  [AC_DEFINE(HAVE_VSNPRINTF, 1, [Define to one if you have vsnprintf])])
+  [AC_DEFINE([HAVE_VSNPRINTF], 1, [Define to one if you have vsnprintf])])
 
 dnl See if the system has strerror, and replace it if not
 AC_CHECK_FUNC(strerror)
 if test "$ac_cv_func_strerror" = no; then
   # No strerror, so see if the SYS_ERRLIST variable can be used by ours
-  AC_CHECK_FUNC(sys_errlist, AC_DEFINE(HAVE_SYS_ERRLIST, 1,
+  AC_CHECK_FUNC(sys_errlist, AC_DEFINE([HAVE_SYS_ERRLIST], 1,
                               [Define to one if you have sys_errlist.]))
   if test "$ac_cv_func_sys_errlist" = yes; then
     AC_CHECK_DECL(sys_errlist, , ,
@@ -669,7 +669,7 @@ if test "$ac_cv_func_hstrerror" = yes -o "$ac_cv_func_h_errlist" = yes; then
   # We still provide some definition, regardless, but this allows people to use
   # a reasonable alternative if the situation allows, rather than using a
   # degenerate version that only says `Host lookup error N'.
-  AC_DEFINE(HAVE_HSTRERROR, 1, [Define to one if you have hstrerror.])
+  AC_DEFINE([HAVE_HSTRERROR], 1, [Define to one if you have hstrerror.])
 fi
 
 ## Checks for function declarations.
@@ -680,7 +680,7 @@ AC_CHECK_DECLS(crypt, , , [#include <unistd.h>])
 
 dnl EWOULDBLOCK is more or less the BSD version of posix EAGAIN.
 IU_CHECK_MACRO(EWOULDBLOCK, [#include <errno.h>], , ,
-  AC_DEFINE(EWOULDBLOCK, EAGAIN, 1, [FIXME]))
+  AC_DEFINE([EWOULDBLOCK], EAGAIN, 1, [FIXME]))
 AC_CHECK_DECLS(errno, , , [#include <errno.h>])
 
 dnl See whether <syslog.h> will declare special internal stuff if we define
@@ -695,7 +695,7 @@ IU_CHECK_MACRO(syslog internal macros,
   [LOG_MAKEPRI LOG_PRI LOG_FAC],
   AC_CHECK_TYPE(CODE,
     AC_CHECK_DECL(prioritynames,
-      AC_DEFINE(HAVE_SYSLOG_INTERNAL, 1, [FIXME]),,
+      AC_DEFINE([HAVE_SYSLOG_INTERNAL], 1, [FIXME]),,
       iu_syslog_includes), , iu_syslog_includes),)
 undefine([iu_syslog_includes])
 
@@ -734,7 +734,7 @@ AC_CACHE_CHECK([for h_errno], inetutils_cv_var_h_errno,
 if test "$inetutils_cv_var_h_errno" = yes; then
   dnl FIXME: Isn't this wrong? Shouldn't the declaration check define
   dnl        this if we find h_errno?
-  AC_DEFINE(HAVE_H_ERRNO, 1, [Define to one if you have h_errno.])
+  AC_DEFINE([HAVE_H_ERRNO], 1, [Define to one if you have h_errno.])
   AC_CHECK_DECL(h_errno, , , [#include <netdb.h>])
 fi
 
@@ -747,20 +747,20 @@ IU_CHECK_MACRO(SEEK_ macros,
   :,
   IU_CHECK_MACRO(L_ seek macros,
     [#include <unistd.h>], L_SET L_INCR L_XTND,
-    AC_DEFINE(SEEK_SET, L_SET, [FIXME])
-    AC_DEFINE(SEEK_CUR, L_INCR, [FIXME])
-    AC_DEFINE(SEEK_END, L_XTND, [FIXME]),
-    AC_DEFINE(SEEK_SET, 0, [FIXME])
-    AC_DEFINE(SEEK_CUR, 1, [FIXME])
-    AC_DEFINE(SEEK_END, 2, [FIXME])))
+    AC_DEFINE([SEEK_SET], L_SET, [FIXME])
+    AC_DEFINE([SEEK_CUR], L_INCR, [FIXME])
+    AC_DEFINE([SEEK_END], L_XTND, [FIXME]),
+    AC_DEFINE([SEEK_SET], 0, [FIXME])
+    AC_DEFINE([SEEK_CUR], 1, [FIXME])
+    AC_DEFINE([SEEK_END], 2, [FIXME])))
 
 dnl Look for the posix _FILENO macros; if not found, use the classic unix values.
 IU_CHECK_MACRO(_FILENO macros,
   [#include <unistd.h>], STDIN_FILENO STDOUT_FILENO STDERR_FILENO,
   :,
-  AC_DEFINE(STDIN_FILENO, 0, [FIXME])
-  AC_DEFINE(STDOUT_FILENO, 1, [FIXME])
-  AC_DEFINE(STDERR_FILENO, 2, [FIXME]))
+  AC_DEFINE([STDIN_FILENO], 0, [FIXME])
+  AC_DEFINE([STDOUT_FILENO], 1, [FIXME])
+  AC_DEFINE([STDERR_FILENO], 2, [FIXME]))
 
 dnl See where to find fd_set (bit-vectors for select) manipulation macros.
 IU_CHECK_MACRO(fd_set macros, [#include <sys/types.h>],
@@ -797,13 +797,13 @@ dnl don't have an entry in utmpx.
 dnl Also for some OS they are better handle with STREAMS
 case "$host" in
 *olaris*)
-  AC_DEFINE(SOLARIS, 1, [FIXME])
-  AC_DEFINE(UTMPX, 1, [FIXME])
-  AC_DEFINE(HAVE_STREAMSPTY, 1, [FIXME])
+  AC_DEFINE([SOLARIS], 1, [FIXME])
+  AC_DEFINE([UTMPX], 1, [FIXME])
+  AC_DEFINE([HAVE_STREAMSPTY], 1, [FIXME])
   ;;
 *irix* | *hpux*)
-  AC_DEFINE(UTMPX, 1, [FIXME])
-  AC_DEFINE(UTMPX, 1, [FIXME])
+  AC_DEFINE([UTMPX], 1, [FIXME])
+  AC_DEFINE([UTMPX], 1, [FIXME])
   ;;
 esac
 

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


commit 580a9e8db4453305c75ae20435da3a09d74d2104
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Nov 15 21:57:10 2009 +0100

    Fixed a few sc_m4_quote_check errors.

diff --git a/ChangeLog b/ChangeLog
index d4d2d1a..310b651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-11-15  Alfred M. Szmidt  <ams@gnu.org>
 
+	* configure.ac: Quote first argument in AC_DEFINE macro
+	calls. (fixes sc_m4_quote_check)
+	* am/config_paths.m4: Likewise.
+	* am/check_weak_refs.m4: Likewise.
+
+2009-11-15  Alfred M. Szmidt  <ams@gnu.org>
+
 	* libtelnet/shishi.c: Don't include
 	<assert.h> (fixes prohibit_assert_without_use).
 
diff --git a/am/check_weak_refs.m4 b/am/check_weak_refs.m4
index dd1f73f..b80ac59 100644
--- a/am/check_weak_refs.m4
+++ b/am/check_weak_refs.m4
@@ -37,8 +37,8 @@ AC_DEFUN([IU_CHECK_WEAK_REFS], [
       [inetutils_cv_attr_weak_refs=yes],
       [inetutils_cv_attr_weak_refs=no]))
   if test "$inetutils_cv_weak_refs" = yes; then
-    AC_DEFINE(HAVE_WEAK_REFS)
-    AC_DEFINE(HAVE_ATTR_WEAK_REFS, 1,
+    AC_DEFINE([HAVE_WEAK_REFS])
+    AC_DEFINE([HAVE_ATTR_WEAK_REFS], 1,
               [Define if you have weak "attribute" references])
   else
     AC_CACHE_CHECK(whether pragma weak references work,
@@ -50,8 +50,8 @@ AC_DEFUN([IU_CHECK_WEAK_REFS], [
 	[inetutils_cv_pragma_weak_refs=yes],
 	[inetutils_cv_pragma_weak_refs=no]))
     if test "$inetutils_cv_pragma_weak_refs" = yes; then
-      AC_DEFINE(HAVE_WEAK_REFS)
-      AC_DEFINE(HAVE_PRAGMA_WEAK_REFS, 1,
+      AC_DEFINE([HAVE_WEAK_REFS])
+      AC_DEFINE([HAVE_PRAGMA_WEAK_REFS], 1,
                 [Define if you have weak "pragma" references])
     else
       AC_CACHE_CHECK(whether asm weak references work,
@@ -63,8 +63,8 @@ AC_DEFUN([IU_CHECK_WEAK_REFS], [
 	  [inetutils_cv_asm_weak_refs=yes],
 	  [inetutils_cv_asm_weak_refs=no]))
       if test "$inetutils_cv_asm_weak_refs" = yes; then
-	AC_DEFINE(HAVE_WEAK_REFS)
-	AC_DEFINE(HAVE_ASM_WEAK_REFS, 1,
+	AC_DEFINE([HAVE_WEAK_REFS])
+	AC_DEFINE([HAVE_ASM_WEAK_REFS], 1,
 	          [Define if you have weak "assembler" references])
       fi
     fi
diff --git a/am/config_paths.m4 b/am/config_paths.m4
index 07fdca4..b7d1bed 100644
--- a/am/config_paths.m4
+++ b/am/config_paths.m4
@@ -38,7 +38,7 @@ AC_DEFUN([IU_CONFIG_PATHS], [
   dnl We need to know if we're cross compiling.
   AC_REQUIRE([AC_PROG_CC])
 
-  AC_CHECK_HEADER(paths.h, AC_DEFINE(HAVE_PATHS_H, 1,
+  AC_CHECK_HEADER(paths.h, AC_DEFINE([HAVE_PATHS_H], 1,
         [Define if you have the <paths.h> header file]) iu_paths_h="<paths.h>")
 
   dnl A slightly bogus use of AC_ARG_WITH; we never actually use
diff --git a/configure.ac b/configure.ac
index 65d6e16..736e849 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,7 +151,7 @@ IU_LIB_TERMCAP
 #AC_CHECK_LIB(readline, rl_bind_key,,, -ltermcap)
 AC_CHECK_LIB(readline, rl_bind_key,
              [LIBREADLINE=-lreadline
-              AC_DEFINE(HAVE_LIBREADLINE, 1,
+              AC_DEFINE([HAVE_LIBREADLINE], 1,
 	           [Define to one if you have -lreadline])],
              [LIBREADLINE=], "$LIBTERMCAP")
 AC_SUBST(LIBREADLINE)
@@ -159,7 +159,7 @@ AC_SUBST(LIBTERMCAP)
 
 AC_CHECK_LIB(history, add_history,
              [LIBHISTORY=-lhistory
-              AC_DEFINE(HAVE_LIBHISTORY, 1,
+              AC_DEFINE([HAVE_LIBHISTORY], 1,
 	           [Define to one if you have -lhistory])],
              [LIBHISTORY=])
 
@@ -167,7 +167,7 @@ AC_CHECK_LIB(history, add_history,
 if test -z "$LIBHISTORY" && test -n "$LIBREADLINE"; then
   AC_CHECK_LIB(readline, add_history,
                [LIBHISTORY=-lreadline
-                AC_DEFINE(HAVE_LIBHISTORY, 1,
+                AC_DEFINE([HAVE_LIBHISTORY], 1,
                      [Define to one if you have -lhistory])],
                [LIBHISTORY=])
 fi
@@ -191,7 +191,7 @@ if test "$with_pam" = yes ; then
   AC_CHECK_LIB(dl, dlopen)
   AC_CHECK_LIB(pam, pam_authenticate, LIBPAM=-lpam)
   if test "$ac_cv_lib_pam_pam_authenticate" = yes ; then
-     AC_DEFINE(WITH_PAM, 1, [Define to one if you have -lpam.])
+     AC_DEFINE([WITH_PAM], 1, [Define to one if you have -lpam.])
   fi
 fi
 AC_SUBST(LIBPAM)
@@ -200,7 +200,7 @@ AC_SUBST(LIBPAM)
 if test "$enable_libls" = yes  -a "$ac_cv_func_fchdir" = yes ; then
   LIBLS="../libls/libls.a"
   libls_BUILD="libls.a"
-  AC_DEFINE(WITH_LIBLS, 1, [Define to one if you have -lls])
+  AC_DEFINE([WITH_LIBLS], 1, [Define to one if you have -lls])
 else
   LIBLS=''
   libls_BUILD=''
@@ -235,8 +235,8 @@ if test "$enable_encryption" = yes -o "$enable_authentication" = yes; then
   case $KERBEROS_VERSION in
   4)
     AC_CHECK_LIB(krb, krb_mk_req,
-                 [LIBAUTH=-lkrb
-                  AC_DEFINE(KRB4)],
+                 LIBAUTH=-lkrb
+                  AC_DEFINE([KRB4]),
                  -L$KERBEROS_DIR)
     if test ".$LIBAUTH" != . ; then
       AC_CHECK_LIB(des, des_key_sched,
@@ -244,11 +244,11 @@ if test "$enable_encryption" = yes -o "$enable_authentication" = yes; then
                    -L$KERBEROS_DIR)
       dnl FIXME: Fix this to one test case.
       test "$enable_authentication" = yes -a "$ac_cv_lib_krb_krb_mk_req" = yes\
-  && AC_DEFINE(KRB4)
+  && AC_DEFINE([KRB4])
       test "$enable_authentication" = yes -a "$ac_cv_lib_krb_krb_mk_req" = yes \
-  && AC_DEFINE(KERBEROS)
+  && AC_DEFINE([KERBEROS])
       test "$enable_encryption" = yes -a "$ac_cv_lib_des_des_key_sched" = yes \
-        && AC_DEFINE(DES_ENCRYPTION)
+        && AC_DEFINE([DES_ENCRYPTION])
     fi
     ;;
   5)
@@ -256,8 +256,8 @@ if test "$enable_encryption" = yes -o "$enable_authentication" = yes; then
     LIBAUTH="$KRB5_LIBS" # FIXME
     INCAUTH=$KRB5_CFLAGS
     if test ".$LIBAUTH" != . ;then
-      AC_DEFINE(KERBEROS)
-      AC_DEFINE(KRB5)
+      AC_DEFINE([KERBEROS])
+      AC_DEFINE([KRB5])
     fi
     ;;
   *)
@@ -272,7 +272,7 @@ if test "$enable_encryption" = yes -o "$enable_authentication" = yes; then
     CPPFLAGS="$CPPFLAGS $INCAUTH"
     AC_CHECK_HEADER(shishi.h,
       AC_CHECK_LIB(shishi, shishi_check_version,
-        AC_DEFINE(SHISHI),
+        AC_DEFINE([SHISHI]),
         [INCAUTH= LIBAUTH=]))
     LIBS=$save_LIBS
     CPPFLAGS=$save_CPPFLAGS
@@ -283,9 +283,9 @@ AC_SUBST(INCAUTH)
 
 dnl Define CPP macros that enable auth/encrypt code
 if test ".$LIBAUTH" != .; then
-  test "$enable_authentication" = yes && AC_DEFINE(AUTHENTICATION, 1,
+  test "$enable_authentication" = yes && AC_DEFINE([AUTHENTICATION], 1,
                    [Define to one if you want authentication.])
-  test "$enable_encryption" = yes     && AC_DEFINE(ENCRYPTION, 1,
+  test "$enable_encryption" = yes     && AC_DEFINE([ENCRYPTION], 1,
                    [Define to one if you want encryption.])
 fi
 
@@ -328,16 +328,16 @@ fi
 
 AH_TEMPLATE([HAVE_GETADDRINFO],[Define to 1 if you have getaddrinfo(3)])
 AC_CHECK_FUNC(getaddrinfo,
-              [AC_DEFINE(HAVE_GETADDRINFO,1)],
+              [AC_DEFINE([HAVE_GETADDRINFO],1)],
 	      [working_ipv6=no
-	       AC_DEFINE(HAVE_GETADDRINFO,0)], [#include <netdb.h>])
+	       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
 
 if test ! "X$ipv6" = "Xno" -a "X$working_ipv6" = "Xyes"; then
-  AC_DEFINE(IPV6, 1, [Define to one if you want IPv6.])
+  AC_DEFINE([IPV6], 1, [Define to one if you want IPv6.])
 else 
   if test "X$ipv6" = "Xyes"; then
     AC_MSG_FAILURE([IPv6 support not available])
@@ -394,7 +394,7 @@ else
     		   [have_recvhoplimt=yes], [have_recvhoplimt=no])
     if test "X$have_recvhoplimt" = "Xno"; then
       IU_CHECK_MACRO(IPV6_HOPLIMIT, [#include <netinet/in.h>], , [
-        AC_DEFINE(IPV6_RECVHOPLIMIT, IPV6_HOPLIMIT,
+        AC_DEFINE([IPV6_RECVHOPLIMIT], IPV6_HOPLIMIT,
                   [Define to IPV6_HOPLIMIT if not available])
       ], [working_icmp6=no])
     fi
@@ -411,7 +411,7 @@ else
     		   [have_beyondscope=yes], [have_beyondscope=no])
     if test "X$have_beyondscope" = "Xno"; then
       IU_CHECK_MACRO(ICMP6_DST_UNREACH_NOTNEIGHBOR, [#include <netinet/icmp6.h>], , [
-        AC_DEFINE(ICMP6_DST_UNREACH_BEYONDSCOPE, ICMP6_DST_UNREACH_NOTNEIGHBOR,
+        AC_DEFINE([ICMP6_DST_UNREACH_BEYONDSCOPE], ICMP6_DST_UNREACH_NOTNEIGHBOR,
                   [Define to ICMP6_DST_UNREACH_NOTNEIGHBOR if not available])
       ], [working_icmp6=no])
     fi
@@ -440,7 +440,7 @@ dnl you have to define some global variables
               eval "ac_cv_lib_wrap_hosts_ctl=no")
   LIBS=$save_LIBS
   if test "$ac_cv_lib_wrap_hosts_ctl" = yes ; then
-    AC_DEFINE(WITH_WRAP, 1, [Define to one if you have -lwrap.])
+    AC_DEFINE([WITH_WRAP], 1, [Define to one if you have -lwrap.])
     LIBWRAP=-lwrap
   fi
   AC_MSG_RESULT($ac_cv_lib_wrap_hosts_ctl);
@@ -485,7 +485,7 @@ dnl Checks return type of signal handlers
 AC_TYPE_SIGNAL
 
 AC_CHECK_TYPE(socklen_t, ,
-              [AC_DEFINE(socklen_t, int,
+              [AC_DEFINE([socklen_t], int,
                          [Define to int if <sys/types.h> does not define])],
               [IU_FLUSHLEFT([#include <sys/types.h>
 	                     #include <sys/socket.h>])])
@@ -493,7 +493,7 @@ AC_CHECK_TYPE(socklen_t, ,
 dnl We may need our own definition for struct osockaddr (equivalent to the
 dnl old 4.3BSD struct sockaddr, and used in grotty bsd talk protocol)
 AC_CHECK_TYPE(struct osockaddr, ,
-              [AC_DEFINE(HAVE_OSOCKADDR_H, 1,
+              [AC_DEFINE([HAVE_OSOCKADDR_H], 1,
                          [Define to one if you have <osockaddr.h>.])],
 	      [IU_FLUSHLEFT([#include <sys/types.h>
                              #include <sys/socket.h> ])])
@@ -509,16 +509,16 @@ AC_CHECK_TYPES(sig_t, , ,
                  #include <signal.h> ])])
 
 dnl sigset_t is a set of signals (4.4BSD)
-AC_CHECK_TYPE(sigset_t, , AC_DEFINE(sigset_t, unsigned long, [FIXME]),
+AC_CHECK_TYPE(sigset_t, , AC_DEFINE([sigset_t], unsigned long, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #include <signal.h> ])])
 
 dnl I'm not sure what this is, but netbsd has it; just use int if necessary.
-AC_CHECK_TYPE(sig_atomic_t, , AC_DEFINE(sig_atomic_t, int, [FIXME]),
+AC_CHECK_TYPE(sig_atomic_t, , AC_DEFINE([sig_atomic_t], int, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #include <signal.h> ])])
 
-AC_CHECK_TYPE(sa_family_t, , AC_DEFINE(sa_family_t, unsigned int, [FIXME]),
+AC_CHECK_TYPE(sa_family_t, , AC_DEFINE([sa_family_t], unsigned int, [FIXME]),
   [IU_FLUSHLEFT([#include <sys/types.h>
                  #ifdef HAVE_SOCKET_H
                  #include <socket.h>
@@ -536,8 +536,8 @@ AC_CHECK_TYPES(cc_t, , ,
                 #endif ])])
 
 dnl Check for compile support for ceratin type
-AC_CHECK_TYPE(long long, , AC_DEFINE(LONG_LONG, long, [Define to long if compiler does not support]))
-AC_CHECK_TYPE(long double, , AC_DEFINE(LONG_DOUBLE, double, [Define to double if compiler does not support]))
+AC_CHECK_TYPE(long long, , AC_DEFINE([LONG_LONG], long, [Define to long if compiler does not support]))
+AC_CHECK_TYPE(long double, , AC_DEFINE([LONG_DOUBLE], double, [Define to double if compiler does not support]))
 
 ### Checks for structures.
 IU_CHECK_MEMBERS([struct sockaddr_in.sin_len], , ,
@@ -616,7 +616,7 @@ LIBS="$_SAVE_LIBS"
 AC_CHECK_FUNC(_obstack_free)
 
 dnl Use (posix) `setpgid' if it's around, otherwise assume a BSD setpgrp
-AC_CHECK_FUNC(setpgid, , AC_DEFINE(setpgid, setpgrp,
+AC_CHECK_FUNC(setpgid, , AC_DEFINE([setpgid], setpgrp,
                           [Define to `setpgrp' if you don't have `setpgid'.]))
 
 dnl We use our own version of getopt (including our own header file) if the
@@ -628,21 +628,21 @@ AC_CHECK_HEADER(poll.h)
 dnl Supply a version of poll() if the libray is missing.
 dnl syslogd uses poll() unconditionnaly.
 AC_CHECK_FUNC(poll, ,
-  [AC_DEFINE(HAVE_POLL_H, 1, [Define to one if you have <poll.h>])])
+  [AC_DEFINE([HAVE_POLL_H], 1, [Define to one if you have <poll.h>])])
 
 dnl See if snprintf exists, otherwise just use a bogus version
 AC_CHECK_FUNC(snprintf,
-  [AC_DEFINE(HAVE_SNPRINTF, 1, [Define to one if you have snprintf])])
+  [AC_DEFINE([HAVE_SNPRINTF], 1, [Define to one if you have snprintf])])
 
 dnl See if vsnprintf exists, otherwise use our own.
 AC_CHECK_FUNC(vsnprintf,
-  [AC_DEFINE(HAVE_VSNPRINTF, 1, [Define to one if you have vsnprintf])])
+  [AC_DEFINE([HAVE_VSNPRINTF], 1, [Define to one if you have vsnprintf])])
 
 dnl See if the system has strerror, and replace it if not
 AC_CHECK_FUNC(strerror)
 if test "$ac_cv_func_strerror" = no; then
   # No strerror, so see if the SYS_ERRLIST variable can be used by ours
-  AC_CHECK_FUNC(sys_errlist, AC_DEFINE(HAVE_SYS_ERRLIST, 1,
+  AC_CHECK_FUNC(sys_errlist, AC_DEFINE([HAVE_SYS_ERRLIST], 1,
                               [Define to one if you have sys_errlist.]))
   if test "$ac_cv_func_sys_errlist" = yes; then
     AC_CHECK_DECL(sys_errlist, , ,
@@ -669,7 +669,7 @@ if test "$ac_cv_func_hstrerror" = yes -o "$ac_cv_func_h_errlist" = yes; then
   # We still provide some definition, regardless, but this allows people to use
   # a reasonable alternative if the situation allows, rather than using a
   # degenerate version that only says `Host lookup error N'.
-  AC_DEFINE(HAVE_HSTRERROR, 1, [Define to one if you have hstrerror.])
+  AC_DEFINE([HAVE_HSTRERROR], 1, [Define to one if you have hstrerror.])
 fi
 
 ## Checks for function declarations.
@@ -680,7 +680,7 @@ AC_CHECK_DECLS(crypt, , , [#include <unistd.h>])
 
 dnl EWOULDBLOCK is more or less the BSD version of posix EAGAIN.
 IU_CHECK_MACRO(EWOULDBLOCK, [#include <errno.h>], , ,
-  AC_DEFINE(EWOULDBLOCK, EAGAIN, 1, [FIXME]))
+  AC_DEFINE([EWOULDBLOCK], EAGAIN, 1, [FIXME]))
 AC_CHECK_DECLS(errno, , , [#include <errno.h>])
 
 dnl See whether <syslog.h> will declare special internal stuff if we define
@@ -695,7 +695,7 @@ IU_CHECK_MACRO(syslog internal macros,
   [LOG_MAKEPRI LOG_PRI LOG_FAC],
   AC_CHECK_TYPE(CODE,
     AC_CHECK_DECL(prioritynames,
-      AC_DEFINE(HAVE_SYSLOG_INTERNAL, 1, [FIXME]),,
+      AC_DEFINE([HAVE_SYSLOG_INTERNAL], 1, [FIXME]),,
       iu_syslog_includes), , iu_syslog_includes),)
 undefine([iu_syslog_includes])
 
@@ -734,7 +734,7 @@ AC_CACHE_CHECK([for h_errno], inetutils_cv_var_h_errno,
 if test "$inetutils_cv_var_h_errno" = yes; then
   dnl FIXME: Isn't this wrong? Shouldn't the declaration check define
   dnl        this if we find h_errno?
-  AC_DEFINE(HAVE_H_ERRNO, 1, [Define to one if you have h_errno.])
+  AC_DEFINE([HAVE_H_ERRNO], 1, [Define to one if you have h_errno.])
   AC_CHECK_DECL(h_errno, , , [#include <netdb.h>])
 fi
 
@@ -747,20 +747,20 @@ IU_CHECK_MACRO(SEEK_ macros,
   :,
   IU_CHECK_MACRO(L_ seek macros,
     [#include <unistd.h>], L_SET L_INCR L_XTND,
-    AC_DEFINE(SEEK_SET, L_SET, [FIXME])
-    AC_DEFINE(SEEK_CUR, L_INCR, [FIXME])
-    AC_DEFINE(SEEK_END, L_XTND, [FIXME]),
-    AC_DEFINE(SEEK_SET, 0, [FIXME])
-    AC_DEFINE(SEEK_CUR, 1, [FIXME])
-    AC_DEFINE(SEEK_END, 2, [FIXME])))
+    AC_DEFINE([SEEK_SET], L_SET, [FIXME])
+    AC_DEFINE([SEEK_CUR], L_INCR, [FIXME])
+    AC_DEFINE([SEEK_END], L_XTND, [FIXME]),
+    AC_DEFINE([SEEK_SET], 0, [FIXME])
+    AC_DEFINE([SEEK_CUR], 1, [FIXME])
+    AC_DEFINE([SEEK_END], 2, [FIXME])))
 
 dnl Look for the posix _FILENO macros; if not found, use the classic unix values.
 IU_CHECK_MACRO(_FILENO macros,
   [#include <unistd.h>], STDIN_FILENO STDOUT_FILENO STDERR_FILENO,
   :,
-  AC_DEFINE(STDIN_FILENO, 0, [FIXME])
-  AC_DEFINE(STDOUT_FILENO, 1, [FIXME])
-  AC_DEFINE(STDERR_FILENO, 2, [FIXME]))
+  AC_DEFINE([STDIN_FILENO], 0, [FIXME])
+  AC_DEFINE([STDOUT_FILENO], 1, [FIXME])
+  AC_DEFINE([STDERR_FILENO], 2, [FIXME]))
 
 dnl See where to find fd_set (bit-vectors for select) manipulation macros.
 IU_CHECK_MACRO(fd_set macros, [#include <sys/types.h>],
@@ -797,13 +797,13 @@ dnl don't have an entry in utmpx.
 dnl Also for some OS they are better handle with STREAMS
 case "$host" in
 *olaris*)
-  AC_DEFINE(SOLARIS, 1, [FIXME])
-  AC_DEFINE(UTMPX, 1, [FIXME])
-  AC_DEFINE(HAVE_STREAMSPTY, 1, [FIXME])
+  AC_DEFINE([SOLARIS], 1, [FIXME])
+  AC_DEFINE([UTMPX], 1, [FIXME])
+  AC_DEFINE([HAVE_STREAMSPTY], 1, [FIXME])
   ;;
 *irix* | *hpux*)
-  AC_DEFINE(UTMPX, 1, [FIXME])
-  AC_DEFINE(UTMPX, 1, [FIXME])
+  AC_DEFINE([UTMPX], 1, [FIXME])
+  AC_DEFINE([UTMPX], 1, [FIXME])
   ;;
 esac
 

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

Summary of changes:
 .gitignore            |    3 +-
 ChangeLog             |   16 ++++++++
 am/check_weak_refs.m4 |   12 +++---
 am/config_paths.m4    |    2 +-
 configure.ac          |  102 ++++++++++++++++++++++++------------------------
 libtelnet/shishi.c    |    1 -
 6 files changed, 76 insertions(+), 60 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sun Nov 15 19:52:26 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9ppS-0003oG-Bn
	for mharc-commit-inetutils@gnu.org; Sun, 15 Nov 2009 19:52:26 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9GIZ-0008CB-CM
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:56:07 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9GIX-0008By-5y
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:56:05 -0500
Received: from [199.232.76.173] (port=51435 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9GIW-0008Bs-KG
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:56:04 -0500
Received: from savannah.gnu.org ([199.232.41.3]:60849 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 <INVALID.NOREPLY@gnu.org>)
	id 1N9GIW-0002xY-5M
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:56:04 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GIU-0001mR-TR
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 10:56:03 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GIU-0001lv-IL
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 10:56:02 +0000
From: "Sergey Poznyakoff" <gray@Mirddin.farlep.net>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/tags/inetutils-1_5
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: b99bba6351c8d5459fe9356efd504a5e8accbfee
Message-Id: <E1N9GIU-0001lv-IL@cvs.savannah.gnu.org>
Date: Sat, 14 Nov 2009 10:56:02 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Mailman-Approved-At: Sun, 15 Nov 2009 19:52:25 -0500
Subject: [SCM] GNU Inetutils  annotated tag, inetutils-1_5,
	created. release_1_5
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, 14 Nov 2009 10:56:07 -0000

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

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

The annotated tag, inetutils-1_5 has been created
        at  b99bba6351c8d5459fe9356efd504a5e8accbfee (tag)
   tagging  9aa2d4d58079a25126e411005f69eca53fa38282 (commit)
  replaces  release1_4_0
 tagged by  Sergey Poznyakoff
        on  Sat Oct 21 12:32:36 2006 +0000

- Log -----------------------------------------------------------------

Alfred M. Szmidt (72):
      (AC_CONFIG_FILES): Removed duplicate entries `libicmp/Makefile' and `ping/Makefile' from the list.
      *** empty log message ***
      *** empty log message ***
      (IU_CONFIG_PATHS): New variables `IU_UCASE' and	`iu_lcase'.
      *** empty log message ***
      2004-09-29  Alfred M. Szmidt  <ams@kemisten.nu>
      2004-09-29  Alfred M. Szmidt  <ams@kemisten.nu>
      *** empty log message ***
      (off_to_str): Don't write out of bounds.  From <uchiyama@s-lab.com>.
      (INCLUDES): Fix typo.
      (setpeer): Changed type of PORT to `int'.  Check that the
      Comply with GCS.
      * ping.c: Include <stdbool.h>
      Comply with GCS.
      Added news entries for 1.4.3.  Based on suggestions from Jeff Bailey
      * uucpd.c (doit): Use `crypt' instead of `CRYPT'.
      (INCLUDES): Removed `-I$(top_builddir)/include'.
      * Makefile.am (INCLUDES): Removed
      * telnetd.h: Include "xalloc.h"
      * rexecd.c (endpwent): Use `crypt' instead of `CRYPT'.
      (INCLUDES): Removed `-I$(top_builddir)/include'.
      (INCLUDES): Variable removed.
      * auth.c (auth_pass): Use `crypt' instead of `CRYPT'.
      (INCLUDES): Removed `-I$(top_builddir)/include'.
      * __progname.c, err.c, forkpty.c, getopt.c, getopt.h, getopt1.c,
      * Makefile.am (dist-hook): Target removed.
      * confpaths.h.in: New file.
      New file.
      New files.
      * lib/.cvsignore: New file.
      (recvrequest): Removed unused variable `st'.  Don't use
      * ftpd.c (retrieve): Don't use ST_BLKSIZE.
      * rcp.c [!HAVE_DECL_STRERROR]: Removed extern declaration for
      (LDADD): Added `-L../lib -lgnu'.
      * telnet.c (init_term): New variable err.  Only do tgetent if we
      (terminaltypeok): Just do tgetent if HAVE_LIBREADLINE
      [!HAVE_DECL_ERRNO]: Removed extern declaration for
      * tftpd.c (TIMEOUT) [!HAVE_DECL_STRERROR]: Removed extern
      Bump version to 1.4.3.
      (noinst_HEADERS): New variable.
      (noinst_HEADERS, EXTRA_DIST): New variables.
      *** empty log message ***
      (AUTOMAKE_OPTIONS): Require automake 1.9.
      * cmdtab.c (cmdtab): Changed type to pointer.
      2005-06-19  Jeroen Dekkers  <jeroen@dekkers.cx>
      2005-06-19  Jeroen Dekkers  <jeroen@dekkers.cx>
      2005-06-19  Jeroen Dekkers  <jeroen@dekkers.cx>
      2005-06-19  Jeroen Dekkers  <jeroen@dekkers.cx>
      Almost forgot this one...
      2005-06-19  Jeroen Dekkers  <jeroen@dekkers.cx>
      2005-06-19  Jeroen Dekkers  <jeroen@dekkers.cx>
      * ping_common.h (ping_cvt_number): Prototype restored (but with
      #include "extern.h" at the end.
      (main): Output version information to stdout.
      (usage): New function.
      #include <getopt.h>
      Don't pass `-s' to autoreconf.
      2005-12-02  Alfred M. Szmidt  <ams@gnu.org>
      2005-12-02  Alfred M. Szmidt  <ams@gnu.org>
      2005-12-02  Alfred M. Szmidt  <ams@gnu.org>
      Include <stdint.h>
      Reformated.  Mention that GNU Inetutils doesn't work on
      *** empty log message ***
      *** empty log message ***
      (SUBDIRS): Added `ifconfig'.
      * inetutils.texi: Updated the license to the GNU Free Document
      *** empty log message ***
      This ain't my day...
      (AC_CHECK_LIB): Remove check for unused libz.
      Fix typos.  Based on patch from Stephen Liebbe <sliebbe@gmail.com>.
      *** empty log message ***
      (auth_user) <default>: Free PCRED->message before returning if

Jeff Bailey (11):
      2002-09-02  Jeff Bailey  <jbailey@outpost.dnsalias.org>
      2002-09-02  Jeff Bailey  <jbailey@outpost.dnsalias.org>
      2002-09-02  Jeff Bailey  <jbailey@outpost.dnsalias.org>
      Fix typo
      Fix delimeter, suggested by Sergey
      2002-09-02  Jeff Bailey  <jbailey@outpost.dnsalias.org>
      2002-12-11  Jeff Bailey  <jbailey@gnu.org>
      2002-12-11  Jeff Bailey  <jbailey@gnu.org>
      2002-12-22  Jeff Bailey  <jbailey@gnu.org>
      2002-12-22  Jeff Bailey  <jbailey@gnu.org>
      Various fixed imported from Debian

Marcus Brinkmann (2):
      2003-09-02  Marcus Brinkmann  <marcus@gnu.org>
      2003-10-24  Marcus Brinkmann  <marcus@gnu.org>

Sergey Poznyakoff (181):
      (IU_CHECK_MEMBER,IU_CHECK_MEMBERS): added new
      Use IU_CHECK_MEMBER(S) instead of AC_CHECK_MEMBERS
      (PATHDEF_DEV): Added to INCLUDES.
      Updated
      Restored ping startup to its right place (bug introduced during switching to new autoconf)
      Oops, forgotten to move setuid() call;
      Fixed memory overrun when writing long
      Updated
      '**' extension (by Michael Deutschmann <michael@talamasca.ocis.net>)
      Documented ** extension
      Updated
      Removed duplicate startup introduced 2002-06-24.
      Updated
      Change to the user's directory after switching to the user privileges.
      Change to the user's directory after switching to the user privileges.
      Updated
      (IU_CHECK_KRB5): Fixed.
      Define KRB5 as well as KERBEROS_V. When
      Added AUTH_ENCRYPT_ defines
      Added OPTS_FORWARD.* defines
      Rewritten
      Add LIBAUTH to the list of libraries.
      Updated
      * server_mode.c: getservbyname() returns the port number in network
      Fix processing the accumulated messages from /dev/kmem (patch provided by Michael Deutschmann <michael@talamasca.ocis.net>)
      Updated
      Oops, fixed typo
      (iruserok): Removed unneded typecasts to (void).
      Renamed Authenticator to TN_Authenticator to avoid name collisions
      Renamed Authenticator to TN_Authenticator to avoid name collisions
      (main): Added spaces between cases in a switch to conform to the GCS.
      Removed unused variable
      Fixed indentation.
      Updated
      Removed libm dependency
      Updated
      (IU_CHECK_KRB5): Check for libresolv.
      Removed KERBEROS_IV and KERBEROS_V defines. Added check for socklen_t.
      Added malloc.c and realloc.c
      Removed checks for HAVE_MALLOC and HAVE_REALLOC: configure takes
      Bugfix: ping.ping_count means the maximum number of packets to send.
      (nabs): New function.
      (display): Allow use of 8-bit ascii.
      (telnetd_setup): Use socklen_t.
      Added AUTHLIBS to LDADD
      (dst_realm_buf): Typo.
      Use KRB5 instead of KERBEROS_V
      Updated
      (ping_recv): Placed checksum and id test before the switch.
      ping/ping.c (ping_run): Bugfix.
      Provide an extern declaration of environ if necessary
      Use err() instead of error()
      Updated
      Removed useless definition of timercmp
      (main): Call init before opening the sockets.
      (ttymsg) Bugfix: typecast is not a valid lvalue
      Updated
      ChangeLog: updated.
      snprintf.h
      Fixed contributor credits
      Alex Muntada
      (tn): Don't set hostname to DNS canonicalized value.
      Updated
      (ping_cvt_number): New function.
      Rewritten diagnostic output.
      (PING_MAX_DATALEN): New define.
      (ping_recv): Check icmp ID only
      Updated
      Use original returned IP header
      Updated
      Use argcv_get to parse configuration files.
      Updated
      Signal handling rewritten
      Updated
      (IU_CONFIG_LINKS): New macro
      Use IU_CONFIG_LINKS. Raised autoconf requirement to 2.59
      Require automake 1.8
      Fixed disthook
      Added to the repository
      Updated
      (ping_cvt_number): Take an additional parameter indicating whether zero value is allowed
      Updated
      Check for termcap before checking for
      Added Todd R. Eigenschink
      (IU_ENABLE_FOO): Define $1_INSTALL_HOOK
      Conditional install-exec-hook
      (doit): Added support for shadow suite.
      Handle ^S/^Q without using -8:
      (short_options): Prefix with '+' to disable
      (doit): Use cached copy of hp->h_name, since
      Updated
      (NCLUDES): Add libinetutils
      Fixed possible memory overruns.
      Fixed indentation.
      Updated
      Added to the repository
      Updated from the recent gnulib
      Remove AC_AIX, AC_MINIX, these are called bygl_USE_SYSTEM_EXTENSIONS, invoked by gl_EARLY
      Updated
      (ping_set_count,ping_set_interval,ping_set_packetsize): Second argument is size_t
      ping.c (main): Changed types of count and interval
      (ping_cvt_number): Remove prototype
      /*-
      Updated
      Forgotten to commit yesterday
      (ping_init): Use PING_DEFAULT_INTERVAL
      (PING_INTERVAL): Renamed to to
      (main,ping_run): Handle ping intervals with millisecond precision
      Updated
      Updated FSF postal mail address
      Removed unused argp
      Updated from gnulib
      Updated from the recent gnulib
      Removed: Not used
      Updated
      Added to the repository
      (getcmd,help): Moved to cmdtab.c
      (getcmd,help): Moved from main.c
      (cmdtab): Remove declaration
      Updated
      Updated FSF postal mail address.
      Changed FSF postal mail address.
      Updated
      Properly quote arguments to AC_ARG_ENABLE and AC_ARG_WITH. Use AC_HELP_STRING where appropriate.
      Properly quote arguments to AC_ARG_ENABLE and AC_ARG_WITH. Use AC_HELP_STRING where appropriate.
      Add Simon Joseffson
      Remove leftover BSD-isms: err,errx,warn,warnx, cast
      Remove leftover BSD-isms: err,errx,warn,warnx, cast
      (main): Change --version output.
      Signal handlers return RETSIGTYPE
      Do not include <kerberosIV/kparse.h>
      Signal handlers return RETSIGTYPE
      Add Shishi support. Patch by Simon Josefsson.
      Define SK_OTHER
      Signal handlers return RETSIGTYPE.
      Remove leftover BSD-isms: err,errx,warn,warnx, cast
      Remove leftover BSD-isms: err,errx,warn,warnx, cast
      Remove ansi2knr. Add copyleft header. Update INCLUDES.
      Move defines to AM_CPPFLAGS. Add INCLUDES. Remove ansi2knr. Add copyleft header.
      (libinetutils_a_SOURCES): Add shishi.c
      (libtelnet_a_SOURCES): Add shishi.c
      Added to the repository
      (noinst_HEADERS): Add shishi_def.h
      Minor fix
      Updated
      Pass modification times first. Patch by Tim Adye <T.J.Adye@rl.ac.uk>
      Update
      (main): Use sigsuspend in favor of sigpause. Change
      Update
      (INCLUDES): Add PATHDEF_KLOG
      Add to the repository
      (noinst_HEADERS): Add libinetutils.h
      (INCLUDES): Add -I$(top_srcdir)/libinetutils
      Use build-aux as an auxiliary tools directory
      Include libinetutils.h
      Update
      (LDADD): Link against gnulib
      [HAVE_READLINE_READLINE_H] Include <readline/readline.h>
      (AC_CHECK_HEADERS): Add readline/readline.h
      Updated
      Remove autogenerated file
      Update
      New options: --environment, to enable passing
      Document new options
      Update
      (AC_CHECK_HEADERS): Add dependecy headers
      (inetutils_TEXINFOS): Add fdl.texi
      Move pathdefs to AM_CPPFLAGS. Load libgnu after libinetutils.
      Update from gnulib
      Include sys/types.h before sys/socket.h and netinet/in.h before arpa/inet.h. Use program_name instead of __progname.
      Include sys/types.h before sys/socket.h
      Use read_utmp instead of manually fiddling with utmp(x) subtleties. Remove __P wrappers, use program_name instead of __progname.
      Remove __P wrappers, use program_name instead of __progname, define it in main (required by error.c)
      New files from gnulib
      Update
      merge with the main ChangeLog
      ChangeLog merge
      Version 1.5
      Update from gnulib
      Use new read_utmp interface.
      Update

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


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sun Nov 15 19:52:27 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9ppT-0003oo-H5
	for mharc-commit-inetutils@gnu.org; Sun, 15 Nov 2009 19:52:27 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9GIc-0008Cn-0T
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:56:10 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9GIV-0008Ba-Ih
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:56:09 -0500
Received: from [199.232.76.173] (port=51433 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9GIV-0008BX-9r
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:56:03 -0500
Received: from savannah.gnu.org ([199.232.41.3]:60834 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 <INVALID.NOREPLY@gnu.org>)
	id 1N9GIU-0002xG-Ot
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:56:02 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GIU-0001lQ-8f
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 10:56:02 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GIT-0001kp-Tq
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 10:56:02 +0000
From: "Miles Bader" <miles@gnu.ai.mit.edu>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/tags/inetutils-1_2i
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: d5ae2faa50cc84e27217a8623963437af18189d0
Message-Id: <E1N9GIT-0001kp-Tq@cvs.savannah.gnu.org>
Date: Sat, 14 Nov 2009 10:56:01 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Mailman-Approved-At: Sun, 15 Nov 2009 19:52:26 -0500
Subject: [SCM] GNU Inetutils  annotated tag, inetutils-1_2i, created. v1_2i
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, 14 Nov 2009 10:56:10 -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 ".

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

The annotated tag, inetutils-1_2i has been created
        at  d5ae2faa50cc84e27217a8623963437af18189d0 (tag)
   tagging  77871767bc70a05103cd55907a21c0de116eab51 (commit)
  replaces  inetutils-1_2
 tagged by  Miles Bader
        on  Thu Jan 23 21:00:01 1997 +0000

- Log -----------------------------------------------------------------

Miles Bader (175):
      (telnet): Remove unecessary debugging printfs.
      Use crypt unconditionally if HAVE_CRYPT is defined.
      .
      (try_help, help, pusage): New function.
      (inetutils_package, inetutils_bugaddr):
      (inetutils_package, inetutils_bugaddr): New declarations.
      (main):
      (main):
      (statcmd, main):
      (telnet): Restore #if accidentally deleted when removing debugging printfs.
      (LINK_DISTFILES): Add `;' before '}'.
      (LINK_DISTFILES): Avoid posix sh bogosity with null for-loop.
      * telnet/telnet.c (init_term): Renamed from setupterm to avoid
      (statcmd, main): Use INETUTILS_PACKAGE.
      (IU_CONFIG_PATHS):
      (inetutils_version): Change to "1.2a".
      (env_init): Use correct hostname in sprintf.
      (IU_CONFIG_PATHS): Escape paths stored in the autoconf cache to avoid
      Formerly openpty.c.~2~
      (SRCS): Add openpty.c (bogus, but...).
      (startslave): Remove declaration of time().
      (ToggleList):
      (termdata):
      (inetutils_version): Change to `1.2b'.
      (IU_CONFIG_PATHS):
      entered into RCS
      Initial revision
      (logout): declare variable RD.
      (inetutils_version): Change to `1.2c'.
      (inetutils_version): Change to `1.2d'.
      [!HAVE_SIG_T] (sig_t): Move to top-level.
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      (SRCS): Update to reflect directory contents.
      Initial revision
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      (inetutils_version): Change to `1.2e'.
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Portability changes for sunos from "Kaveh R." <ghazi@caip.rutgers.edu>:
      Initial revision
      Formerly setenv.c.~2~
      entered into RCS
      Test $inetutils_cv_macro_fd_set_macros, not $inetutils_cv_fd_set_macros.
      (IU_CONFIG_PATHS):
      [!HAVE_FCLOSE_DECL] (fclose): New declaration.
      <sys/stream.h>: Make include conditional on HAVE_SYS_STREAM_H, not STREAMS.
      (DISTFILES): Add protocols & protocols/talkd.h.
      (sig_atomic_t, HAVE_FCLOSE_DECL, HAVE_ENVIRON_DECL): New define slots.
      Initial revision
      (SRCS): Update to reflect directory contents.
      (SRCS): Update to reflect directory contents.
      Initial revision
      entered into RCS
      (SRCS): Add revoke.c, login_tty.c, & iruserok.c.
      (PATH_HEQUIV): New path (only necessary for iruserok.c).
      From  Bernhard Rosenkraenzer <bero@startrek.in-trier.de>:
      (AC_REPLACE_FUNCS): Add login_tty & iruserok.
      Initial revision
      (long_options, ohelp, main): Add --prompt/-p.
      glibc glob package
      Inetutils info
      Pathname configuration header
      Talk protocol header
      Initial checkin.
      (STDIN_MASK):
      (AC_CHECK_FUNCS):
      (tpacket):
      [!HAVE_STRERROR_DECL] (strerror):
      [!HAVE_STRERROR_DECL] (strerror):
      (HAVE_SYSLOG_INTERNAL, HAVE_STRCHR_DECL, HAVE_STRERROR_DECL,
      (index, rindex):
      (get_names):
      (setup_term):
      (_VA, vwarnx, vwarn, warn, warnx, verr, verrx, err, errx):
      Update prototypes to include const where appropriate.
      (rcmd, rresvport):
      (local_domain, topdomain):
      (fprintlog):
      (dolog):
      (main):
      (main, setsignal, done, lostpeer, reader, stop, writeroob):
      <sys/filio.h>:
      (OBJS):
      (DISTFILES):
      (IO_CHECK_MACRO):
      [!HAVE_GETPASS_DECL] (getpass):
      [!HAVE_PCLOSE_DECL] (pclose):
      [!HAVE_GETUSERSHELL_DECL] (getusershell):
      (ftpd_popen):
      Test HAVE_CRYPT_DECL, not HAVE_CRYPT, when deciding to declare crypt.
      Check __STDC__ in addition to HAVE_STDARG_H since hpux cc has the header but
      Test HAVE_*_H macro, not __STDC__ for headers.
      Test HAVE_*_H macro, not __STDC__, for headers.
      Don't base "const" support on __STDC__.
      (strvis):
      (telnet_gets):
      <sys/filio.h>:
      <sys/tty.h>:
      [HAVE_SYS_FILIO_H] <sys/filio.h>:
      .
      (inetutils_version): Change to `1.2f'.
      .
      Initial checkin.
      KNRize function signatures.
      sunos4 cc chokes on indented cpp directives; put # in first column and put
      (openpty): Change type of LINE from `char []' to `char *const'.
      (inetutils_version): Change to `1.2g'.
      (IU_LIB_CURSES):
      .
      (makedir):
      .
      Include termios.h for decl of TIOCNOTTY on solaris.
      Include sys/filio.h.
      Cast 2nd arg of sendto() to (const char *).
      (localstat): Evaluate tty_istrapsig() not tty_istrapsig.
      (main): Use O_RDWR instead of "2" in call to open().
      (rmut):
      Add an (ignored) int parameter to functions passed to signal().
      (send_delete): Cast 2nd arg of sendto() to (const char *).
      Fix POSIX signal handling.
      (ctl_transact):
      (main):
      (main, talk):
      Don't define FD_SETSIZE, let OS headers do it.
      Use O_RDWR instead of "2" in call to open().
      Include sys/sysmacros.h for solaris to get the roundup() macro.
      (RCP_MODEMASK): Renamed from MODEMASK to avoid conflict with solaris
      (HAVE_UTMP_UT_TV, sigset_t):
      Add POSIX signal handling.
      (intr, lostpeer): Add an (ignored) int parameter.
      (cmdarbort, abortsend, abortrecv, psabort, abortpt):
      (proxabort): Add an (ignored) int parameter.
      Add check for ut_tv field in struct wtmp.
      .
      (AC_REPLACE_FUNCS): Add herror.
      (SRCS): Add herror.c.
      .
      A generic replacement for herror
      Add existance & decl tests for h_errno.
      (openpty):
      (HAVE_H_ERRNO, HAVE_H_ERRNO_DECL):
      (command): Constify fmt argument.
      (command): Normalize variable argument list usage.
      (reply, lreply, setproctitle): Normalize variable argument list usage.
      Require both HAVE_STDARG_H && __STDC__==1 to allow inclusion of
      (warn, warnx, err, errx): Normalize variable argument list usage.
      (snprintf): Normalize variable argument list usage.
      (oldw, run_err): Normalize variable argument list usage.
      (warning): Normalize variable argument list usage.
      (error): Normalize variable argument list usage.
      (call): Normalize variable argument list usage.
      .
      (inetutils_version): Change to `1.2h'.
      .
      (tgetent):
      (CPPFLAGS):
      (HAVE_HTONS_DECL):
      (login_tty):
      (tn):
      (htons):
      (libinetutils_version):
      .

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


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sun Nov 15 19:52:29 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9ppV-0003q4-OE
	for mharc-commit-inetutils@gnu.org; Sun, 15 Nov 2009 19:52:29 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9GIc-0008D3-Me
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:56:10 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9GIW-0008Bi-FP
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:56:10 -0500
Received: from [199.232.76.173] (port=51434 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9GIW-0008Bf-7d
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:56:04 -0500
Received: from savannah.gnu.org ([199.232.41.3]:60841 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 <INVALID.NOREPLY@gnu.org>)
	id 1N9GIV-0002xM-2K
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 05:56:03 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GIU-0001ly-I6
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 10:56:02 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GIU-0001lO-8h
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 10:56:02 +0000
From: "Jeff Bailey" <jbailey@outpost.dnsalias.org>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/tags/inetutils-1_4
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: ec580f61a9f45a8e5c1460b11905859ae12073ec
Message-Id: <E1N9GIU-0001lO-8h@cvs.savannah.gnu.org>
Date: Sat, 14 Nov 2009 10:56:02 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Mailman-Approved-At: Sun, 15 Nov 2009 19:52:27 -0500
Subject: [SCM] GNU Inetutils  annotated tag, inetutils-1_4,
	created. release1_4_0
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, 14 Nov 2009 10:56:11 -0000

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

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

The annotated tag, inetutils-1_4 has been created
        at  ec580f61a9f45a8e5c1460b11905859ae12073ec (tag)
   tagging  e2da675d8d53545643e6dbd908bbd9e0e74315d5 (commit)
  replaces  inetutils-1_3_1b
 tagged by  Jeff Bailey
        on  Wed Jul 31 21:51:19 2002 +0000

- Log -----------------------------------------------------------------

Alfred M. Szmidt (61):
      Removed.
      Rewrite.
      (IU_UCASE, iu_lcase): Variables removed.
      (AUTOMAKE_OPTIONS): Require GNU Automake 1.6.
      .
      *** empty log message ***
      (bin_PROGRAMS): Use ftp_BUILD instead of BUILD_FTP.
      [HAVE_FCLOSE_DECL]: Renamed to HAVE_DECL_FCLOSE.
      (inetdaemon_PROGRAMS): Use ftpd_BUILD instead of BUILD_FTPD.
      [HAVE_GETUSERSHELL_DECL]: Renamed to HAVE_DECL_GETUSERSHELL.
      [HAVE_FCLOSE_DECL]: Renamed to HAVE_DECL_FCLOSE.
      (noinst_LIBRARIES) Use libglob_BUILD instead of BUILD_LIBGLOB.
      [HAVE_CRYPT_DECL]: Renamed to HAVE_DECL_CRYPT.
      (bin_PROGRAMS): Use ifconfig_BUILD instead of BUILD_IFCONFIG.
      (inetdaemon_PROGRAMS): Use inetd_BUILD instead of BUILD_INETD.
      [HAVE_H_ERRNO_DECL]: Renamed to HAVE_DECL_H_ERRNO.
      [HAVE_H_ERRLIST_DECL]: Renamed to HAVE_DECL_H_ERRLIST.
      [HAVE_ERRNO_DECL]: Renamed to HAVE_DECL_ERRNO.
      (noinst_LIBRARIES): Use libls_BUILD instead of BUILD_LIBLS.
      (bin_PROGRAMS): Use logger_BUILD instead of BUILD_LOGGER
      (bin_PROGRAMS): Use ping_BUILD instead of BUILD_PING.
      (bin_PROGRAMS): Use rcp_BUILD instead of BUILD_RCP.
      (inetdaemon_PROGRAMS): Use rexecd_BUILD instead of BUILD_REXECD.
      (bin_PROGRAMS): Use rlogin_BUILD instead of BUILD_RLOGIN.
      (inetdaemon_PROGRAMS): Use rlogind_BUILD instead of BUILD_RLOGIND.
      (bin_PROGRAMS): Use rsh_BUILD instead of BUILD_RSH.
      (inetdaemon_PROGRAMS): Use rshd_BUILD instead of BUILD_RSHD.
      (inetdaemon_PROGRAMS): Use syslogd_BUILD instead of BUILD_SYSLOGD.
      (bin_PROGRAMS): Use talk_BUILD instead of BUILD_TALK.
      (inetdaemon_PROGRAMS): Use talkd_BUILD instead of BUILD_TALKD.
      (bin_PROGRAMS): Use telnet_BUILD instead of BUILD_TELNET.
      [HAVE_GETPASS_DECL]: Renamed to HAVE_DECL_GETPASS.
      [HAVE_HTONS_DECL]: Renamed to HAVE_DECL_HTONS.
      (inetdaemon_PROGRAMS): Use telnetd_BUILD instead of BUILD_TELNETD.
      (bin_PROGRAMS): Use tftp_BUILD instead of BUILD_TFTP.
      [HAVE_ERRNO_DECL]: Renamed to HAVE_DECL_ERRNO.
      (inetdaemon_PROGRAMS): Use tftpd_BUILD instead of BUILD_TFTPD.
      [HAVE_STRERROR_DECL]: Renamed to HAVE_DECL_STRERROR.
      (inetdaemon_PROGRAMS): Use uucpd_BUILD instead of BUILD_UUCPD.
      (bin_PROGRAMS): Use whois_BUILD instead of BUILD_WHOIS.
      .
      Removed form feeds.
      .
      Nobody saw that.
      (VERSION): Variable removed.
      Removed.
      (inetutils_package): Renamed to PACKAGE_NAME.
      *** empty log message ***
      <version>: Include removed.
      <version.h>: Include removed.
      *** empty log message ***
      <version.h>: Include removed.
      <version.h>: Include removed.
      (EXTRA_DIST): Removed version.h.in from the list.
      *** empty log message ***
      (main): Moved ping startup code to after the parsing
      *** empty log message ***
      Removed erroneous #ifdef's in the checks for __P and syslog internal macros.
      *** empty log message ***
      (config.h.in): Removed.
      *** empty log message ***

Jakob 'sparky' Kaivo (2):
      Add /etc/inetd.d support to inetd
      fix tyop in usage for inetd

Jeff Bailey (20):
      Makefile updates - This will not compile yet wait for next update.  Pathnames
      Add start of ping **doesn't do anything useful**
      Add VERSION, PACKAGE, and GNU_PACKAGE information back in.
      Added resolver functionality
      Update ChangeLog
      Update patches to bring up to date
      Create autogen.sh file for autogenerating build environment
      Advertise new commit-inetutils mailing list
      Mass add of .cvsignore files.
      Build cleanup - Remove INSTALL file from repository
      Use 4 digit year for make release
      Mention autogen.sh
      Integrate inetutils into the build, add missing headers to the Makefile
      Include changelogs
      Build maintenance
      Further fixes to the build system
      Upgrade to autoconf 2.52, automake 1.5, and various fixes for srcdir!=builddir builds
      Administrivia
      Bump version to 1.4.  This is the release.  Happy almost 5th year aniversary
      Tweaks

Marcus Brinkmann (60):
      2000-08-01  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-01  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-01  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-01  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-01  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-01  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-02  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-02  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-02  Marcus Brinkmann  <marcus@gnu.org>
      fix type
      2000-08-02  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-02  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-03  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-03  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-03  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-03  Marcus Brinkmann  <marcus@gnu.org>
      sorry, I am tired and don't know where my head is
      2000-08-03  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-03  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-03  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-03  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-04  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-05  Marcus Brinkmann  <marcus@gnu.org>
      In doc/syslogd.texi:
      2000-08-09  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-10  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-16  Marcus Brinkmann  <marcus@gnu.org>
      2000-08-16  Marcus Brinkmann  <marcus@gnu.org>
      2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
      2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
      2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
      2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
      2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
      2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
      2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
      2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
      2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
      2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
      2000-10-30  Marcus Brinkmann  <marcus@gnu.org>
      2000-10-31  Marcus Brinkmann  <marcus@gnu.org>
      2000-10-31  Marcus Brinkmann  <marcus@gnu.org>
      2000-10-31  Marcus Brinkmann  <marcus@gnu.org>
      2000-11-03  Marcus Brinkmann  <marcus@gnu.org>
      2000-11-25  Marcus Brinkmann  <marcus@gnu.org>
      2001-01-16  Marcus Brinkmann  <marcus@gnu.org>
      2001-01-31  Marcus Brinkmann  <marcus@gnu.org>
      2001-02-22  Marcus Brinkmann  <marcus@gnu.org>
      2001-02-22  Marcus Brinkmann  <marcus@gnu.org>
      TODO: Remove obsolete entry.
      2001-06-04  Marcus Brinkmann  <marcus@gnu.org>
      2001-06-23  Marcus Brinkmann  <marcus@gnu.org>
      2001-08-17  Marcus Brinkmann  <marcus@gnu.org>
      2001-08-29  Marcus Brinkmann  <marcus@gnu.org>
      2001-11-02  Marcus Brinkmann  <marcus@gnu.org>
      2001-11-02  Marcus Brinkmann  <marcus@gnu.org>
      Various fixes to make it compile a bit better on FreeBSD.
      Substitute `Hurd' with `the Hurd'.
      2002-03-05  Marcus Brinkmann  <marcus@gnu.org>
      Give some attribution to the bug reporter.
      2002-07-27  Marcus Brinkmann  <marcus@gnu.org>

Miles Bader (158):
      (HAVE_TTYNAME_DECL):
      (sys/wait.h):
      (sys/wait.h):
      (AC_CHECK_HEADERS):
      (termio.h):
      .
      Added to CVS repository
      (print_service):
      (addarg):
      (main):
      (inetutils_version):
      .
      added
      (INCLUDES): Set PATH_INETDCONF.
      bazzle!
      committing miles' additions to the ChangeLog from nearly six months
      added
      removed, because it is shadowing /usr/include/paths.h
      (INCLUDES): Use $(PATHDEF_INETDCONF) instead of the old hardcoded
      bazzle!
      now built automagically in build directory
      new file
      (EXTRA_DIST): Renamed variable from noinst_HEADERS.  Added
      bazzle!
      (SUBDIRS): Use an explicit list, rather than @DIRS@.
      bazzle!
      Removed some old, commented-out cruft.
      bazzle!
      no longer used
      (libinetutils_a_SOURCES): Removed version.c and all the files covered
      bazzle!
      moved from the tftp directory
      added; just as with ../Makefile.am, I looked at Makefile.in to figure out what to put in this file, since Jeff Bailey forgot to commit it.
      Updated bug reporting address.
      Updated the bug reporting address.
      (LDADD): Added ../libinetutils -linetutils.
      bazzle!
      (INCLUDES): Added `$(PATHDEF_FTPWELCOME) $(PATHDEF_FTPUSERS)
      bazzle!
      (INCLUDES): Added `$(PATHDEF_RSH) $(PATHDEF_CP)'.
      bazzle!
      bazzle!
      bazzle!
      (LDADD): Added `-L../libinetutils -linetutils'.
      bazzle!
      (LDADD): Added `-L../libinetutils -linetutils'.
      bazzle!
      (INCLUDES): Added `$(NCURSES_INCLUDE)'.
      bazzle!
      (LDADD): Added `-L../libinetutils -linetutils'.
      bazzle!
      (LIBTERMCAP, LIBCRYPT, LIBUTIL): Set make variables corresponding to
      bazzle!
      (tftp_SOURCES): Removed tftpsubs.c; that file has been moved to
      bazzle!
      moved to ../libinetutils or ../headers
      (noinst_HEADERS): Removed tftpsubs.h
      bazzle!
      (INCLUDES): Added `$(PATHDEF_UUCICO)'.
      bazzle!
      (noinst_HEADERS): Remove krb4-proto.h; Kerberos 4 doesn't meet our
      bazzle!
      added
      (INCLUDES): Added `$(PATHDEF_TMP) $(PATHDEF_BSHELL)'.
      (INCLUDES): Added `$(PATHDEFF_DEVNULL) $(PATHDEF_NOLOGIN)
      bazzle!
      (LDADD): Added `-L../libinetutils -linetutils'.
      bazzle!
      (INCLUDES): Added `$(PATHDEF_TTY_PFX) $(PATHDEF_DEVNULL)
      bazzle!
      (INCLUDES): Added `$(PATHDEF_BSHELL)'.
      bazzle!
      (INCLUDES): Added `$(PATHDEF_DEFPATH) $(PATHDEF_BSHELL)'.
      bazzle!
      readded
      (INCLUDES): Added `$(PATHDEF_DEV) $(PATHDEF_LOGIN)'.
      bazzle!
      (INCLUDES): Added `$(PATHDEF_BSHELL) $(PATHDEF_NOLOGIN)
      bazzle!
      Added a line that reads `@PATHDEFS_MAKE@'.
      bazzle!
      Added a line that reads `@PATHDEFS_MAKE@'.
      bazzle!
      Added a line that reads `@PATHDEFS_MAKE@'.
      bazzle!
      (INCLUDES): Added `$(PATHDEF_TTY)'.
      bazzle!
      Removed the EXTRA_DIST cruft, which appears to be
      (EXTRA_DIST): Added paths.
      bazzle!
      (LDADD): Added `$(LIBGLOB)'.
      bazzle!
      (EXTRA_DIST): Added `confpaths.h.in'.
      bazzle!
      (AM_INIT_AUTOMAKE): Added a third argument to suppress VERSION and
      bazzle!
      rebuilt
      added a line EXTRA_DIST = $(man_MANS)
      bazzle!
      (IU_ENABLE_FOO): New AC_DEFUN.
      added
      rebuilt
      Removed some old cruft related to the old system of not building some
      bazzle!
      (SUBDIRS): Added whois.
      bazzle!
      (LDADD): Added `$(LIBTERMCAP)'.
      bazzle!
      [HAVE_LIBREADLINE]: Declare `char *line' instead of `char line[200]'.
      bazzle!
      (cmdscanner): Added new code that is used to replace some old code iff
      bazzle!
      (version.h): Include it.
      bazzle!
      Undo Jeff's previous change to this file, so that changing the version
      bazzle!
      [ENCRYPTION || AUTHENTICATION || TN3270] (help): Added a second arg to
      bazzle!
      For every IU_ENABLE_CLIENT and IU_ENABLE_SERVER call, and an AC_SUBST
      bazzle!
      (IU_ENABLE_FOO): Fix syntax errors.  Remove call to AC_SUBST; there
      bazzle!
      (DISTCLEANFILES): Added `include/*.h include/*/*.h include/stamp-h'.
      bazzle!
      (AUTOMAKE_OPTIONS): Removed; the options are set adaquaely in
      bazzle!
      Call IU_ENABLE_CLIENT for ping.  Call AC_SUBST for BUILD_PING.
      bazzle!
      Thu Mar 26 20:40:06 1998  Joel N. Weber II  <nemo@nautilus.sub>
      rebuilt
      Added news about 1.3.90.
      Updated.
      foobar.
      (libtelnet_a_SOURCES): Removed krb4encpwd.c rsaencpwd.c spx.c; they
      bazzle!
      Fri Apr  3 17:11:44 1998  Joel N. Weber II  <nemo@koa.iolani.honolulu.hi.us>
      Call IU_ENABLE_CLIENT and AC_SUBST for whois.
      bazzle!
      (SUBDIRS): Added ping.
      bazzle!
      add
      (whois_SOURCES): Added config.c.
      bazzle!
      (main): Use inetutils_package and inetutils_version rather than
      bazzle!
      Random cosmetic changes.
      bazzle
      Fri Apr 10 11:13:51 1998  Joel N. Weber II  <nemo@nautilus.sub>
      Added some notes about manpages being installed in spite of
      foobar
      Added some comments explaining the search path that the GNU whois
      bazzle!
      (cfline): Allow either spaces or tabs in /etc/syslog.conf; previously,
      bazzle!
      (logmsg): When opening the console device, pass the O_NOCTTY flag to
      bazzle!
      (anonymous_login_name): New variable.
      bazzle!

Sergey Poznyakoff (412):
      security fixes.
      Add comments.
      do setuid(getuid()) before doing exec.
      typos, restriction on port and add LOGNAME.
      New file.
      new file.
      change doit() signature and use the sockfd parameter.
      use FD_XX macros.
      use FDCLR.
      use STDIN_FILENO, use maxfd.
      updates.
      updates.
      updates.
      updates.
      updates.
      updates.
      updates.
      updates.
      updates.
      updates.
      version 1.3.2.a
      adding this for missing OS.
      support for glob.
      globbing.
      globing
      adding for support.
      warning.
      say for 1.3.3
      add.
      new.
      .
      part of xgetcwd
      move to headers/
      add autoheder -l headers
      typo MAX_ARGC
      typo.
      typo sylog()
      redfrom ready typ fd_set.
      FNM_*
      LDADD
      link fnmatch.h
      ping not install
      update
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      No need autogenerated.
      add README-alpha.
      typo.
      update.
      update.
      remove let automake do the magic
      use of "/dev/ptyXX" whihc was constant
      .
      .
      .
      .
      .
      .
      .
      .
      .
      .
      .
      .
      .
      .
      .
      .
      If HAVEPTSNAME is define use the SYSVR4 psuedo ttys
      add afew names in THANKS and configure.in check for ptsname().
      add afew names in THANKS and configure.in check for ptsname().
      add afew names in THANKS and configure.in check for ptsname().
      add afew names in THANKS and configure.in check for ptsname().
      add WTMPX UTMPX in paths. check for utmpx functions.
      add new files utmp_{init, logout}
      add new files utmp_{init, logout}
      add new files utmp_{init, logout}
      .
      TO be able to login on SYSV
      a new version.
      .
      remove check for GETCWD_SIZE.
      remove check for GETCWD_SIZE.
      remove check for GETCWD_SIZE.
      add SOLARIS and UTMPX
      .
      .
      .
      .
      .
      Thanks to Jeff Smith
      Thanks to Jeff Smith
      support STREAMs
      support STREAMs
      .
      ..
      to handle STREAM Ctl messages
      .
      ..
      8 bit clean.
      use snprintf not sprintf.
      snprintf instead sprintf.
      cosmetic changes for usage()
      increase constants.
      changes from Marcus.
      Modified Files:
      Modified Files:
      Modified Files:
      .
      Modified Files:
      ChangeLog
      ChangeLog THANKS configure.in libinetutils/Makefile.am
      THANKS libinetutils/Makefile.am rlogin/rlogin.c
      ChangeLog libinetutils/Makefile.am
      Makefile.am configure.in ftp/Makefile.am ftpd/Makefile.am
      libls/Makefile.am libls/cmp.c libls/extern.h libls/ls.1
      libls/print.c
      Makefile.am
      Makefile.am
      main.c
      ftp/ChangeLog ftp/cmds.c ftp/cmdtab.c ftp/domacro.c
      ftpd/ChangeLog ftpd/Makefile.am ftpd/ftpd.c ftpd/popen.c
      whois/ChangeLog whois/Makefile.am
      headers/config.h.in
      THANKS
      ChangeLog cmds.c ftp.1 ftp.c ftp_var.h
      THANKS
      configure.in ftpd/ftpd.c ftpd/popen.c headers/config.h.in
      ChangeLog configure.in ftpd/ChangeLog ftpd/Makefile.am
      ChangeLog Makefile.am paths ftpd/ChangeLog ftpd/Makefile.am
      ChangeLog ftpd.8 ftpd.c popen.c
      ftp/main.c libtelnet/read_passwd.c tftp/main.c
      ChangeLog configure.in ftp/Makefile.am ftpd/Makefile.am
      gwhois/Makefile.am gwhois/README gwhois/TODO
      ChangeLog ftpd.c
      ChangeLog configure.in ftpd/ftpd.c headers/config.h.in
      ChangeLog Makefile.am cmp.c ls.c print.c util.c
      ChangeLog fts.c
      headers/config.h.in
      ChangeLog configure.in ftpd/ChangeLog ftpd/Makefile.am
      ftpd/ftpd.c
      ftpd/ChangeLog
      ChangeLog syslogd.8 syslogd.c
      libls/ChangeLog libls/print.c
      syslogd/ChangeLog syslogd/syslogd.c
      syslogd/ChangeLog syslogd/syslogd.c
      ChangeLog bsdport.h fts.c ls.c print.c
      ChangeLog iruserok.c
      ChangeLog configure.in ftp/ChangeLog ftp/ruserpass.c
      configure.in libinetutils/ChangeLog libinetutils/Makefile.am
      libinetutils/poll.c libinetutils/poll.h libinetutils/waitpid.c
      configure.in
      ring.h
      error in the declaration of xstrdup()
      autogen.sh
      doc/inetutils.texi doc/syslogd.texi doc/version.texi
      configure.in
      autogen.sh
      ChangeLog
      More formatting on syslogd.
      Commited Micheal Patch.
      1.2.3e
      Link headers/poll.h -->include/poll.h if the OS is lacking poll().
      rename libinetutils/poll.h to headers/poll.h
      new options -S --sync to sync on every line and behaves like
      Better pam suport From Micheal Vogt.
      ChangeLog poll.c ttymsg.c
      Remove catching of SIGCHLD since ttymsg() double fork().
      Audit: Coding style to comply to GNU style, cleanup the code
      Error in the code, the inet file descriptor was not initialize
      configure.in
      autogenerated by `autoheader -l headers'
      in autogen.sh autoheader should be call __after__ aclocal to generate
      typo insystm.h should be in_systm_h
      Check for fchdir().
      separate ruserok and iruserok for the same file, some OS has ruseok
      Renaming syslog to logger.
      rules for CVS.
      The idea is to reduce the number of side effects i.e. reducing the number
      added --with-pam --with-wrap to test PAM and tcp_wrapper support
      nuke those bzero() for memset
      Various little cleanups and incompatibilities:
      The code was wrong, we can only rely on the value of errno
      Update gwhois.
      Fix the bug reported by Joachim Gabler in openpty.c
      Correct a bug when exploging macros.
      Patches From Sergey.
      MAP_FAILED is not declared on some systems
      Added missing defines
      Defaults for major() & minor() for systems lacking them
      minor changes
      Call with the wrong number set of arguments and provide a prototype.
      Updatte.
      initial implementation
      initial checkin
      Initial implementation of ping and libicmp
      added netdb.h to the entry for PATH_HEQUIV
      updated
      ICMP_ADDRESSMASK request implementation
      added icmp_address.c
      added new protos
      eliminated unused variable
      changes too numerous to mention
      reflect changes to libping.c
      added OMIT_DEPENDENCIES
      Implemented ICMP_TIMESTAMP and ICMP_ADDRESSMASK requests.
      changes to libicmp/, ping/
      implemented
      changed counters in struct PING from int to longs
      Fixed a bunch of inconsistencies (thanks to Alain).
      use @BUILD_PING@ instead of directly assigning bin_PROGRAMS
      added libicmp and ping to build
      integrated libicmp and ping
      icmp was used unitialized.
      Patches by Alain: use <signal.h> instead of <sys/signal.h>, truncate pid_t before using as ping_ident.
      changed type of ping_datalen to size_t
      Patches by Alain: <signal.h> -> <sys/signal.h>
      changes to libicmp, ping
      Lots of const consistency changes,  Since this the 20th century
      Check for some of the ifreq fields and sa_len in sockaddr.
      * if_index.c: Fall back to the generic version if
      ifconfig/Changelog
      more comments.
      Provide a definition of ifr_index it if it's not present in struct ifreq.
      if_nameindex(): Actually fall back. Besides, the return value was unspecified
      changes to if_index.[ch]
      Reverted previous change: it is already present in system.h
      Removed # define ifr_ifindex ifr_index.
      updated
      Include ifconfig.h instead of if_index.h.
      changes to if_index.c
      Filled in with entries from main ChangeLog
      Use inetutils_package instead of PACKAGE. Same for VERSION
      Fixed entry for 2001-06-19
      Filled in with entries from main ChangeLog
      Return fully qualified domain name.
      Rewritten from scratch. This version works on systems lacking TIOCSCTTY ioctl
      Changes to localhost.c, login_tty.c
      Rewritten from scratch. Implemented -a (verify hostname) option. Added --reverse-required and
      updated
      Changes to ping,rlogind,libinetutils
      Check for setpgid(), vhangup().
      Set RMSGN|RPROTDAT on master side of pty pair, so it
      Changes to openpty()
      got rid of getmsg() call in favor of using regular read()
      More chages to rlogind.c
      Added HAVE_POLL_H
      Remove all the trailing spaces.
      Much of the changes where indentation to follow GNU
      Security fix from Eric Gillespie Jr. concerning telnetd.
      Fixed coding style to comply with GNU.
      Removed restriction on hostname lengths in ipaddr2str. Fixed coding style.
      Fixed coding style
      Use ENCRYPTION instead of CRYPT.
      inetutils/libls can be disable by calling configure --disable-libls
      updates.
      The idea is to provide an easy way to add services without
      Fixed memory overrun in main.
      You missed one sergey 8-).
      New file.
      Marco D'Itri whois is much more complete then the original
      * Makefile.am: Add EXTRA_DIST = ftpcmd.c.  To force the
      Finally get gwhois to build when srcdir != buildir
      2000-08-08  Michael Weiser
      List built headers in BUILT_SOURCES so the autodependency code works.
      * process.c: merge redundant #ifdef's
      * configure.in: Check for strsignal().
      New file.
      IU_INCLUDED_REGEX: Check for working regex, provide replacement, if necessary.
      Implementation-specific defines.
      Access-control lists.
      Added new sources.
      Talkd essencially rewritten. New feature: system-wide and
      Simple string tokenizer.
      Regex functions.
      Added argcv.[ch], regex.[ch]
      Added missing LDADD.
      Provide replacements for PAM_CONV_AGAIN and PAM_INCOMPLETE for
      Check for regex.
      Completely rewritten.
      Updated.
      * announce.c: Add <sys/uio.h> for "struct iovec" definition.
      Initialize `head' to NULL (in case the acl contains an empty hostlist).
      Fix in read_acl()
      * configure.in: Version to 1.3.2g.
      Unfortunately some platforms, like QNX/Neutrino does not implement flow
      Typos.
      Certain programs __MUST__ be install root to work properly. There is a hook
      Arrange Indentation.
      .
      update.
      Oops!, split the ChangeLog to the right */ChangeLog entries.
      Fixed declaration of read_address().
      Macro os2sin_addr: extract struct in_addr from struct osockaddr.
      do_announce(): use os2sin_addr for readability.
      Added extra debug info.
      Removed 'if (getuid ())' block.
      Bunch of fixes. Thanks to Alain for noticing.
      * Makefile.am:  Add -I ../libinetutils to have the argvc_xx()
      identatation
      Updated.
      Added missing %s to format spec
      Updated
      rlogin:  Implement long options and clean some code.
      The description of rlogin protocol.  Should probably
      Newfile
      Add SUBDIRS
      Updated.
      Added doc/rfc/Makefile
      The second argument for daemon() should be 0: close
      A little fix
      * rlogin.c: Removed copyryght and sccsid.
      * rsh.c: Removed copyright and sccsid variable.
      Updated.
      * rshd.c: #include <version.h> added.
      * rcp.c: GNU coding style changes
      * daemon.c: GNU coding style changes.
      * rshd.texi: New file.
      enable rsh.texi.
      * rcp.c (help): New function.
      * rcp.texi: New file.
      Update Makefile.am
      * rexecd.texi: New file.
      rexecd first draft.
      * inetd.texi: New file.
      * ftpd.texi: New file.
      * talk.texi: New file.
      * talkd.texi: New file.
      ping.8 new file.
      Use the 4.4 BSD Lite2 manual page.
      Add ping.8 in Makefile.am
      * ping.texi: New file.
      Put some sections.
      * tftp.texi: New file.
      * ftp.texi: New file.
      Removed poll.h, sys/poll.h from AC_CHECK_HEADERS. Added individual check
      Added $(man_MANS) to EXTRA_DIST.
      Removed redeclaration of hstrerror: it is provided in include/config.h
      Updated
      Fixed syntax error: sizeof int. Should be: sizeof(int).
      * Fall back to mktemp ()/open () if mkstemp () is
      * Added <time.h> in poll.c
      * Added getpass() replacement.
      Note for r* commands to be install setuid root.
      (INCLUDES): Added -I$(top_builddir)/include (needed
      updated
      PTY-related functions.
      Added pty.c
      Changed definition of line.
      Removed unneeded functions. Some of them are re-implemented in pty.c
      (doit, telnet, readstream): Reorganized.
      Started fixing horrible mess in telnetd. To begin with,
      Added AC_CANONICAL_SYSTEM to set $host properly.
      Updated
      Removed extra HAVE_UTMPX_H. Added HAVE_CC_T and HAVE_LIBREADLINE.
      Check for obstack functions. Modified
      Added obstack.h
      Add READLINE variable
      Added to repository
      Added obstack.c
      Use #ifdef UTMPX, instead of HAVE_UTMPX_H.
      Use #ifdef UTMPX, instead of  HAVE_UTMPX_H.
      Removed
      Terminal-specific functions.
      Rewritten
      Use obstack instead of manually allocating memory.
      Removed conditional dependencies on LINEMODE, reduced number of global variables, etc.
      Updated
      Initialize login_invocation. Fixed calls to inet_ntoa.
      Use new expand_line to create login command line.
      Added missing prototypes.
      Added line expansion code.
      Updated
      (utmp_logout): Bugfix: gettimeofday() (and time()) was used over a member
      Updated for use with Kerberos V.
      (print_hostinfo): Print local host name.
      Include <termio.h>
      Updated
      #undef's for KERBEROS_IV and KERBEROS_V
      (IU_CHECK_KRB5): New macro: check for the presense of Kerberos v.5
      New options: --with-krb4[=PATH], --with-krb5[=PATH]
      Added @INCAUTH@ to INCLUDES list
      Added @INCAUTH@ and @LIBAUTH@.
      Fixed to compile with AUTHENTICATION/ENCRYPTION on.
      Updated
      AC_CHECK_MEMBERS (as of version 2.53 ) fails to
      Checks for HAVE_DECL variables must read
      Use HAVE_STRUCT_[type]_[member] instead of HAVE_[type]_[member].
      Removed obsolete OMIT_DEPENDENCIES.
      More changes relating to the transition to autoconf >= 2.52

gabler (3):
      SOLARIS login has different commandline parameters, it requires the terminal
      changed my email address
      rlogind/rlogind.c: exec to /bin/login requires additional

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


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sun Nov 15 19:52:31 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9ppW-0003qh-Ti
	for mharc-commit-inetutils@gnu.org; Sun, 15 Nov 2009 19:52:30 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9GMq-0000ox-IV
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:00:32 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9GMm-0000nR-OP
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:00:31 -0500
Received: from [199.232.76.173] (port=40856 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9GMm-0000nE-BU
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:00:28 -0500
Received: from savannah.gnu.org ([199.232.41.3]:43276 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 <INVALID.NOREPLY@gnu.org>)
	id 1N9GMl-0003de-U0
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:00:28 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GMl-0002AB-9i
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:00:27 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GMi-00029S-2L
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:00:25 +0000
From: "Sergey Poznyakoff" <gray@Mirddin.farlep.net>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/tags/inetutils-1_6
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 8a396815149ec343ce81894d004d46c33b07f510
Message-Id: <E1N9GMi-00029S-2L@cvs.savannah.gnu.org>
Date: Sat, 14 Nov 2009 11:00:24 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Mailman-Approved-At: Sun, 15 Nov 2009 19:52:29 -0500
Subject: [SCM] GNU Inetutils  annotated tag, inetutils-1_6,
	created. inetutils-1_6
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, 14 Nov 2009 11:00:33 -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 ".

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

The annotated tag, inetutils-1_6 has been created
        at  8a396815149ec343ce81894d004d46c33b07f510 (tag)
   tagging  e492bcf0b313f739d027bdccad55742cf0f901a2 (commit)
  replaces  release_1_5
 tagged by  Alfred M. Szmidt
        on  Sat Nov 14 12:04:50 2009 +0100

- Log -----------------------------------------------------------------
Version 1.6 of GNU inetutils.

Alfred M. Szmidt (95):
      Fix typos. (silent fix)
      * telnetd/utility.c: Include <time.h>.
      Fix typo in previous commit.
      Ran indent and cppi.  Removed lint keywords.
      (localhost): Determine the FQDN only if gethostname did not fail.
      (store): Do not overwrite `name' with gunique's return value, to avoid
      (init): Close CF properly before returning.
      Removed lint cruft.
      Removed lint comments.
      (errno, sys_nerr): Removed extern declarations.
      Include <utmpx.h> if and only if HAVE_UTMPX_H is defined.
      [AUTHENTICATION || ENCRYPTION]: Include <unistd.h>.
      Include "xalloc.h".
      * ping/ping_common.h (DEFAULT_PING_COUNT): New macro.
      (ring_encrypt): Fix typo in prototype.
      (IU_CHECK_MEMBERS): Fix typo 'stuct' -> 'struct'.
      Updated.
      2007-03-10  Elian Gidoni  <arkaino@gmail.com>
      Removed a bunch of duplicate entries, and fix some minor formating
      Removed more duplicates (thanks to Ben Asselstine).
      Files removed.
      * configure.ac: Removed libglob checks.
      * ping/.cvsignore: Added `ping6'.
      * .cvsignore: Added `build-aux'.
      * libtelnet/shishi.c (krb5shishi_send): Don't set a use-session-key
      * README-alpha: Updated instructions for generating auto* and
      * m4/.phony: New file.
      Remove invalid entry.
      (usage): Fix typo.
      * bootstrap.conf (checkout_only_file): New variable.
      ping/Makefile.am (MAINTAINERCLEANFILES): New variable.
      Makefile.am (MAINTAINERCLEANFILES): New variable.
      Fix email address for Debarshi Ray.
      * Makefile.am (MAINTAINERCLEANFILES): Removed variable.
      (snapshot): Target renamed to `snapshot'.
      * bootstrap.conf: Create m4/ if it does not exist.
      * acinclude.m4 (jm_INCLUDED_REGEX): Function removed.
      *** empty log message ***
      (gnulib_modules): Removed `restrict' and `stdio-safer'.
      *silent commit*
      (__USE_GNU): Define macro if and only if __USE_GNU was not defined.
      * libinetutils/Makefile.am (libinetutils_a_SOURCES): Removed `xalloc-die.c' from list.
      Files removed.
      Minor clean up.
      (gnulib_modules): Added "argp".
      Include "config.h".
      (INCLUDES): Added -I$(top_srcdir)/libinetutils.
      Don't include <getopt.h>.  Include <argp.h> and "libinetutils.h".  Use error() instead of "output
      *** empty log message ***
      *** empty log message ***
      Include <argp.h>.  Don't include <getopt.h>.
      *** empty log message ***
      *** empty log message ***
      (doc): Fix typo.
      *** empty log message ***
      (do_try): Removed variable PREV_TRACE.
      * ftpd/ftpd.c (main): Changed type of ADDRLEN to socklen_t.
      Updated.
      (parse_opt): Renamed argument ST to STATE.
      * ping/ping_timestamp.c: Don't include "getopt.h".  Include
      Don't include "getopt.h".
      File removed.
      Rewritten.
      Fix indenting. *silent change*
      Fix indenting. *silent change*
      Fix indenting. *silent change*
      * tftpd/tftpd.c (struct formats) [notdef]: Removed unused field
      Fix indenting. *silent change*
      * ping/ping6.c (main): Move argument parsing before calling
      * inetd/inetd.8: Fix typo.
      .
      (makedir): Pass NAME when calling reply().
      (gnulib_modules): Removed `allocsa'.
      2007-06-26  Karl Berry  <karl@freefriends.org>  (tiny change)
      Updated to GPLv3.
      Fix typo.
      *** empty log message ***
      * ftp/ftp.c (command): Ignore SIGPIPE when flushing COUT.
      2007-07-21  Debarshi Ray <debarshi.ray@gmail.com>
      Fixed mail addy for rishi.
      2007-07-26  Debarshi Ray <rishi@gnu.org>
      (rsource): Free BUF after call to source().
      How did that get there... Sorry Debarshi.
      2008-09-26  Alfred M. Szmidt  <ams@gnu.org>
      *** empty log message ***
      New file.
      *** empty log message ***
      * doc/inetutils.texi: Refer to `COMMAND invocation' nodes for
      *** empty log message ***
      * .cvsignore (config.h, confpaths.h, stamp-h1): Added files.
      2008-09-26  Arash Yadegarnia <arash@bluehome.net> (tiny change)
      Time to go to bed...
      * Makefile.am (DISTCLEANFILES): Removed `include/*.h,
      Renamed ftp and ftpd nodes to `FOO invocation'.  Formatting fixes.
      *** empty log message ***

Debarshi Ray (26):
      * bootstrap.conf (gnulib_modules): Added `readline'.
      * ftp/cmds.c (setpeer): If HOSTNAME is set, try to reconnect to it.
      2008-04-14  Edward Attfield <attfield@nortel.com> (tiny change)
      2008-04-15  Ludovic Courtès <ludo@gnu.org> (tiny change)
      2008-04-16  Debarshi Ray <rishi@gnu.org>
      2008-04-16  Debarshi Ray <rishi@gnu.org>
      2008-04-17  Alfred M. Szmidt <ams@gnu.org> (tiny change)
      2008-04-17  Debarshi Ray <rishi@gnu.org> (tiny change)
      2008-04-18  Debarshi Ray <rishi@gnu.org>
      2008-04-19  Debarshi Ray <rishi@gnu.org>
      2008-04-20  Michal Svoboda <pht@spatium.org> (tiny change)
      2008-04-21  Guillem Jover <guillem@hadrons.org>
      2008-05-13  Debarshi Ray <rishi@gnu.org>
      2008-05-20  Debarshi Ray <rishi@gnu.org>
      2008-06-05  Debarshi Ray <rishi@gnu.org>
      Fixed ChangeLog.
      2008-06-11  Debarshi Ray <rishi@gnu.org>
      2008-08-09  Debarshi Ray <rishi@gnu.org>
      ChangeLog fixes.
      2008-08-12  Debarshi Ray  <rishi@gnu.org>
      Actually add new files.
      2008-08-12  Debarshi Ray  <rishi@gnu.org>
      2008-08-12  Debarshi Ray  <rishi@gnu.org>
      2008-08-13  Debarshi Ray  <rishi@gnu.org>
      2008-08-23  Debarshi Ray  <rishi@gnu.org>
      2008-08-23  Debarshi Ray  <rishi@gnu.org>

Sergey Poznyakoff (12):
      (main): Allow zero argument for -c
      Update
      Fix typo
      Update
      (TOOMANY): Raise to 1000, as specified in the docs.
      Document [.max] suffix.
      Update
      Inetd improvements.
      Some housekeeping.
      Some more work on inetd.
      Use proper Texinfo markup
      Version 1.6

Simon Josefsson (7):
      Fix build instructions.
      2007-04-12  Simon Josefsson  <simon@josefsson.org>
      2007-04-12  Simon Josefsson  <simon@josefsson.org>
      Add initial tests/ for self-tests.
      2007-04-12  Simon Josefsson  <simon@josefsson.org>
      2007-04-12  Simon Josefsson  <simon@josefsson.org>
      Delay initialization of Shishi.

rakeshpandit (5):
      2008-10-14  Rakesh Pandit  <rakesh.pandit@gmail.com>
      2008-10-14  Rakesh Pandit  <rakesh.pandit@gmail.com>
      2008-10-06  Rakesh Pandit  <rakesh.pandit@gmail.com>
      2008-10-06  Rakesh Pandit  <rakesh.pandit@gmail.com>
      2008-10-14  Rakesh Pandit  <rakesh.pandit@gmail.com>

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


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Sun Nov 15 19:52:33 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9ppZ-0003rt-3o
	for mharc-commit-inetutils@gnu.org; Sun, 15 Nov 2009 19:52:33 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9GMu-0000qg-Qa
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:00:36 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9GMn-0000nZ-1a
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:00:35 -0500
Received: from [199.232.76.173] (port=40855 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9GMm-0000nC-A5
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:00:28 -0500
Received: from savannah.gnu.org ([199.232.41.3]:43274 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 <INVALID.NOREPLY@gnu.org>)
	id 1N9GMl-0003da-KT
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 06:00:27 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GMg-00029V-VH
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:00:25 +0000
Received: from ams by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1N9GMN-0001zY-VV
	for commit-inetutils@gnu.org; Sat, 14 Nov 2009 11:00:06 +0000
From: "Miles Bader" <miles@gnu.ai.mit.edu>
To: commit-inetutils@gnu.org
X-Git-Refname: refs/tags/inetutils-1_1
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 14778120f1fc1e8e9026ed5bc2f36be307560eec
Message-Id: <E1N9GMN-0001zY-VV@cvs.savannah.gnu.org>
Date: Sat, 14 Nov 2009 11:00:04 +0000
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Mailman-Approved-At: Sun, 15 Nov 2009 19:52:31 -0500
Subject: [SCM] GNU Inetutils  annotated tag, inetutils-1_1,
	created. inetutils-1_1
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, 14 Nov 2009 11:00:37 -0000

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

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

The annotated tag, inetutils-1_1 has been created
        at  14778120f1fc1e8e9026ed5bc2f36be307560eec (tag)
   tagging  e7534b2f9d676ed8e8c65b1a1ed28a8223c3f151 (commit)
 tagged by  Alfred M. Szmidt
        on  Sat Nov 14 12:05:42 2009 +0100

- Log -----------------------------------------------------------------
Version 1.1 of GNU inetutils.

Miles Bader (344):
      Initial revision
      Initial revision
      Initial revision
      Initial revision
      Initial revision
      Initial revision
      Initial revision
      Initial revision
      Initial revision
      Initial revision
      Initial revision
      Initial revision
      Formerly defs.h.~2~
      Formerly libtelnet/Makefile.in.~2~
      Formerly telnetd/Makefile.in.~2~
      entered into RCS
      Initial revision
      Formerly inetd.c.~2~
      Formerly inetd/Makefile.in.~2~
      Initial revision
      Formerly ftpd.c.~2~
      Formerly extern.h.~2~
      Formerly ftpcmd.y.~2~
      Formerly ftpcmd.y.~3~
      Formerly popen.c.~2~
      Formerly ftpd.c.~3~
      Formerly rshd.c.~3~
      Initial revision
      Formerly rlogind/Makefile.in.~2~
      Formerly configure.in.~2~
      Formerly rlogind.c.~2~
      Formerly rlogind.c.~3~
      Formerly ftpd/Makefile.in.~2~
      Formerly ftpd.c.~4~
      Formerly rlogind.c.~4~
      Formerly rshd.c.~4~
      Formerly rshd/Makefile.in.~2~
      Initial revision
      Formerly uucpd/Makefile.in.~2~
      Formerly uucpd.c.~3~
      Formerly configure.in.~3~
      Formerly ftpd/Makefile.in.~3~
      entered into RCS
      Formerly ftpd.c.~5~
      Formerly rshd.c.~5~
      Formerly ftpcmd.y.~4~
      entered into RCS
      Initial revision
      Formerly telnet/Makefile.in.~2~
      Formerly commands.c.~2~
      Formerly externs.h.~2~
      Formerly sys_bsd.c.~2~
      Formerly configure.in.~4~
      entered into RCS
      Initial revision
      Formerly ruserpass.c.~2~
      Formerly main.c.~2~
      Formerly ftp.c.~2~
      Formerly cmds.c.~2~
      Formerly cmds.c.~3~
      Formerly telnet/Makefile.in.~3~
      Formerly configure.in.~5~
      Initial revision
      Formerly ftp/Makefile.in.~2~
      Formerly ftp_var.h.~2~
      Formerly cmds.c.~4~
      Formerly ftp.c.~3~
      Formerly extern.h.~2~
      Formerly extern.h.~3~
      Formerly cmds.c.~5~
      Formerly ftp_var.h.~3~
      Formerly ftp.c.~4~
      entered into RCS
      Initial revision
      Formerly rcp/Makefile.in.~2~
      Initial revision
      Formerly rsh.c.~2~
      Formerly rsh/Makefile.in.~2~
      Formerly rexecd.c.~2~
      Initial revision
      Formerly talkd/Makefile.in.~2~
      Formerly rlogin/Makefile.in.~2~
      entered into RCS
      Initial revision
      Formerly configure.in.~6~
      Formerly rlogin.c.~2~
      Formerly rcp/Makefile.in.~3~
      Formerly talk/Makefile.in.~2~
      Formerly rlogin/Makefile.in.~3~
      Formerly rsh/Makefile.in.~3~
      Formerly ftp/Makefile.in.~3~
      Formerly ftpd/Makefile.in.~4~
      Formerly inetd/Makefile.in.~3~
      Formerly libtelnet/Makefile.in.~3~
      Formerly rcp/Makefile.in.~4~
      Formerly rexecd/Makefile.in.~2~
      Formerly rlogin/Makefile.in.~4~
      Formerly rlogind/Makefile.in.~3~
      Formerly rsh/Makefile.in.~4~
      Formerly rshd/Makefile.in.~3~
      Formerly talk/Makefile.in.~3~
      Formerly talkd/Makefile.in.~3~
      Formerly telnet/Makefile.in.~4~
      Formerly telnetd/Makefile.in.~3~
      Formerly uucpd/Makefile.in.~3~
      Initial revision
      Formerly tftp/Makefile.in.~2~
      Initial revision
      Formerly tftpd/Makefile.in.~2~
      Formerly configure.in.~7~
      entered into RCS
      Formerly telnetd.c.~2~
      Formerly telnetd.c.~3~
      Formerly telnetd.c.~4~
      Formerly sys_term.c.~2~
      Formerly telnetd.c.~5~
      Formerly configure.in.~8~
      Formerly rcp/Makefile.in.~5~
      Formerly cmds.c.~6~
      Formerly ftpd.c.~6~
      Formerly sys_term.c.~3~
      Formerly telnetd.c.~6~
      Formerly uucpd/Makefile.in.~4~
      Formerly rlogind.c.~5~
      Formerly ftpd/Makefile.in.~5~
      entered into RCS
      Formerly tftpd/Makefile.in.~3~
      Formerly inetd/Makefile.in.~4~
      Formerly telnetd/Makefile.in.~4~
      Formerly rlogind/Makefile.in.~4~
      Formerly ftpd/Makefile.in.~6~
      Formerly uucpd/Makefile.in.~5~
      entered into RCS
      Formerly telnetd.c.~7~
      Formerly main.c.~3~
      Formerly cmds.c.~7~
      Formerly configure.in.~9~
      Formerly tftpd/Makefile.in.~4~
      Formerly tftp/Makefile.in.~3~
      Formerly rcp/Makefile.in.~6~
      Formerly talk/Makefile.in.~4~
      Formerly talkd/Makefile.in.~4~
      Formerly uucpd/Makefile.in.~6~
      Formerly rexecd/Makefile.in.~3~
      Formerly libtelnet/Makefile.in.~4~
      Formerly telnet/Makefile.in.~5~
      Formerly ftp/Makefile.in.~5~
      Formerly rlogin/Makefile.in.~5~
      Formerly rsh/Makefile.in.~5~
      Formerly rlogind/Makefile.in.~5~
      Formerly rshd/Makefile.in.~4~
      Formerly telnetd/Makefile.in.~5~
      Formerly ftpd/Makefile.in.~7~
      Formerly inetd/Makefile.in.~5~
      Initial revision
      Formerly ftp/Makefile.in.~6~
      Formerly ftpd/Makefile.in.~8~
      Formerly inetd/Makefile.in.~6~
      Formerly libtelnet/Makefile.in.~5~
      Formerly rcp/Makefile.in.~7~
      Formerly rexecd/Makefile.in.~4~
      Formerly rlogin/Makefile.in.~6~
      Formerly rlogind/Makefile.in.~6~
      Formerly rsh/Makefile.in.~6~
      Formerly rshd/Makefile.in.~5~
      Formerly talk/Makefile.in.~5~
      Formerly talkd/Makefile.in.~5~
      Formerly telnet/Makefile.in.~6~
      Formerly telnetd/Makefile.in.~6~
      Formerly tftp/Makefile.in.~4~
      Formerly tftpd/Makefile.in.~5~
      Formerly uucpd/Makefile.in.~7~
      Formerly configure.in.~10~
      Formerly config.make.in.~2~
      Formerly tftpd/Makefile.in.~6~
      Initial revision
      Initial revision
      entered into RCS
      Formerly config.make.in.~3~
      Formerly syslogd/Makefile.in.~2~
      Formerly talkd/Makefile.in.~6~
      Formerly configure.in.~11~
      Initial revision
      Formerly rules.make.~2~
      Formerly ftp/Makefile.in.~7~
      Formerly libtelnet/Makefile.in.~6~
      Formerly telnet/Makefile.in.~7~
      Formerly inetd/Makefile.in.~7~
      Formerly rules.make.~3~
      Formerly config.make.in.~4~
      Formerly telnetd/Makefile.in.~7~
      Formerly ftpd/Makefile.in.~9~
      Formerly syslogd/Makefile.in.~3~
      Formerly syslog/Makefile.in.~2~
      Formerly rlogin/Makefile.in.~7~
      Formerly rsh/Makefile.in.~7~
      Formerly rshd/Makefile.in.~6~
      Formerly rexecd/Makefile.in.~5~
      Formerly rlogind/Makefile.in.~7~
      Formerly rcp/Makefile.in.~8~
      Formerly uucpd/Makefile.in.~8~
      Formerly tftp/Makefile.in.~5~
      Formerly tftpd/Makefile.in.~7~
      Formerly talkd/Makefile.in.~7~
      Formerly talk/Makefile.in.~6~
      Formerly ping/Makefile.in.~2~
      Formerly syslogd.c.~2~
      Formerly configure.in.~12~
      Formerly syslogd/Makefile.in.~4~
      Formerly syslogd.c.~3~
      entered into RCS
      Formerly ftpd.c.~7~
      Formerly cmds.c.~8~
      Formerly cmds.c.~9~
      Formerly cmds.c.~10~
      Formerly ftp.c.~5~
      Formerly rlogin.c.~3~
      Formerly main.c.~2~
      Formerly rlogin.c.~4~
      Formerly rlogin.c.~5~
      Formerly rlogin.c.~6~
      entered into RCS
      Formerly syslog/Makefile.in.~3~
      entered into RCS
      Initial revision
      Formerly version.c.~2~
      Initial revision
      Formerly config.make.in.~5~
      Formerly rules.make.~4~
      Formerly inetd/Makefile.in.~8~
      Formerly rcp/Makefile.in.~9~
      Formerly libtelnet/Makefile.in.~7~
      Formerly rexecd/Makefile.in.~6~
      Formerly ftpd/Makefile.in.~10~
      Formerly telnetd/Makefile.in.~8~
      Formerly rshd/Makefile.in.~7~
      Formerly rlogind/Makefile.in.~8~
      Formerly uucpd/Makefile.in.~9~
      Formerly syslogd/Makefile.in.~5~
      Formerly tftpd/Makefile.in.~8~
      Formerly telnet/Makefile.in.~8~
      Formerly ftp/Makefile.in.~8~
      Formerly rsh/Makefile.in.~8~
      Formerly rlogin/Makefile.in.~8~
      Formerly tftp/Makefile.in.~6~
      Initial revision
      Formerly libinetutils/Makefile.in.~2~
      Formerly ftpd/Makefile.in.~11~
      entered into RCS
      Formerly syslog/Makefile.in.~4~
      Formerly talk/Makefile.in.~7~
      Formerly configure.in.~13~
      Formerly talkd/Makefile.in.~8~
      Formerly config.make.in.~6~
      Formerly libinetutils/Makefile.in.~3~
      Formerly configure.in.~14~
      Formerly ftp/Makefile.in.~9~
      Formerly libinetutils/Makefile.in.~4~
      Formerly rsh/Makefile.in.~9~
      Formerly uucpd/Makefile.in.~10~
      Formerly telnet/Makefile.in.~9~
      Formerly telnetd/Makefile.in.~9~
      Formerly tftp/Makefile.in.~7~
      Formerly tftpd/Makefile.in.~9~
      Formerly rshd/Makefile.in.~8~
      Formerly syslog/Makefile.in.~5~
      Formerly talk/Makefile.in.~8~
      Formerly rcp/Makefile.in.~10~
      Formerly rexecd/Makefile.in.~7~
      Formerly rlogin/Makefile.in.~9~
      Formerly rlogind/Makefile.in.~9~
      Formerly inetd/Makefile.in.~9~
      Formerly libtelnet/Makefile.in.~8~
      entered into RCS
      Formerly syslogd/Makefile.in.~6~
      Formerly talkd/Makefile.in.~9~
      Formerly configure.in.~15~
      Formerly ftpd/Makefile.in.~12~
      entered into RCS
      Formerly config.make.in.~7~
      entered into RCS
      entered into RCS
      (try_help): New function.
      (ohelp, try_help, usage): New functions.
      (ohelp): Remove extra newline.
      (help): Remove extra newlines.  Fiddle text.
      (set_proc_title):
      Check for -lcrypt.
      Link include files from headers.
      (_PATH_WTMP): Define to be WTMP_FILE if necessary.
      ($(bindir)/logger): Remove before linking.
      If !HAVE_OSOCKADDR, include <osockaddr.h> to define it.
      If !HAVE_OSOCKADDR, include <osockaddr.h> to define it.
      If !HAVE_OSOCKADDR, include <osockaddr.h> to define it.
      If !HAVE_OSOCKADDR, include <osockaddr.h> to define it.
      (set_edit_chars): Use tcgetattr if we have it.
      (AC_CHECK_HEADERS): Add sys/ioctl_compat.h & vis.h.
      (main): Use localhost.
      (telnet): Use localhost.
      (SRCS): Add localhost.c.
      (main): Use localhost.
      (env_init): Use localhost.
      (get_names): Use localhost.
      (LocalHostNameLen): Variable removed.
      (local_domain): Use localhost.
      (ruserpass): Use localhost.
      Initial revision
      [!HAVE_OSOCKADDR] <osockaddr.h>: New include.
      (INST_PROG_FLAGS): New variable.
      [!HAVE_VIS_H] (strvis):
      (install, uninstall, mostlyclean, distclean, maintainer-clean, dist):
      (clean): Target removed.
      (clean): Target removed.
      (clean): Target removed.
      (clean): Target removed.
      (clean): Target removed.
      (clean): Target removed.
      (clean): Target removed.
      (clean): Target removed.
      (clean): Target removed.
      (clean): Target removed.
      (clean): Target removed.
      (clean): Target removed.
      (DISTFILES): Add config.h.in & acconfig.h.
      (LDLIBS): Add $(LIBUTIL) & $(LIBCRYPT).  Use += instead of `:= ... $(LDLIBS)'.
      (LDLIBS): New variable.
      (AC_CONFIG_HEADER): Added.
      (CPPFLAGS): Remove -D_BSD_SOURCE (now in config.h).
      [HAVE_CONFIG_H] <config.h>: New include.
      Initial revision
      [HAVE___P && HAVE_SYS_CDEFS_H] <sys/cdefs.h>: New include.
      (paths.h): New test.
      (paths.h): New test.
      (HAVE_SYS_ERRLIST_DECL, HAVE_SIG_T, HAVE___PROGNAME, HAVE_SNPRINTF):
      [!HAVE___PROGNAME] (main): Set __progname.
      <getopt.c>: New include.
      [!HAVE___PROGNAME] (main): Set __progname.
      [HAVE_CONFIG_H] <config.h>: New include.
      Initial revision
      (DISTFILES): Add arpa/telnet.h, arpa/ftp.h, & arpa/tftp.h.
      (INCLUDES): Add arpa/telnet.h, arpa/ftp.h, & arpa/tftp.h.
      (DISTFILES): Add `arpa' (the directory).
      (_LINK_DISTFILE):
      (inetutils_version): Change to 1.1.

roland (2):
      entered into RCS
      entered into RCS

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


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Mon Nov 16 05:43:32 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9z3U-00078j-Ou
	for mharc-commit-inetutils@gnu.org; Mon, 16 Nov 2009 05:43:32 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9z3T-00077j-4P
	for commit-inetutils@gnu.org; Mon, 16 Nov 2009 05:43:31 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9z3R-00076P-L1
	for commit-inetutils@gnu.org; Mon, 16 Nov 2009 05:43:30 -0500
Received: from [199.232.76.173] (port=49008 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9z3R-000767-Cl
	for commit-inetutils@gnu.org; Mon, 16 Nov 2009 05:43:29 -0500
Received: from savannah.gnu.org ([199.232.41.3]:56833 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 1N9z3R-0006Sm-1R
	for commit-inetutils@gnu.org; Mon, 16 Nov 2009 05:43:29 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <simon@josefsson.org>) id 1N9z3P-0007LB-T8
	for commit-inetutils@gnu.org; Mon, 16 Nov 2009 10:43:27 +0000
Received: from jas by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1N9z3P-0007Kj-Kw
	for commit-inetutils@gnu.org; Mon, 16 Nov 2009 10:43:27 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 580a9e8db4453305c75ae20435da3a09d74d2104
X-Git-Newrev: 50ec75e55a23457ff607d56a311686afac06a044
Message-Id: <E1N9z3P-0007Kj-Kw@cvs.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 16 Nov 2009 10:43:27 +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_6-99-g50ec75e
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: Mon, 16 Nov 2009 10:43:31 -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  50ec75e55a23457ff607d56a311686afac06a044 (commit)
      from  580a9e8db4453305c75ae20435da3a09d74d2104 (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=50ec75e55a23457ff607d56a311686afac06a044


commit 50ec75e55a23457ff607d56a311686afac06a044
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Nov 16 11:43:18 2009 +0100

    configure.ac: Don't call AB_INIT here too.

diff --git a/ChangeLog b/ChangeLog
index 310b651..5460065 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-16  Simon Josefsson  <simon@josefsson.org>
+
+	* configure.ac: Don't call AB_INIT here too, it is already invoked
+	via gnulib.  Reported by Alfred M. Szmidt <ams@gnu.org>.
+
 2009-11-15  Alfred M. Szmidt  <ams@gnu.org>
 
 	* configure.ac: Quote first argument in AC_DEFINE macro
diff --git a/configure.ac b/configure.ac
index 736e849..ef9efe0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,6 @@ AC_CONFIG_AUX_DIR([build-aux])
 AM_CONFIG_HEADER([config.h:config.hin])
 AC_CANONICAL_SYSTEM # FIXME: Why not just _HOST?
 
-AB_INIT
-
 # config.h turns this on, so make sure it's on for our tests too
 #CPPFLAGS=-D_BSD_SOURCE
 

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

Summary of changes:
 ChangeLog    |    5 +++++
 configure.ac |    2 --
 2 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



From MAILER-DAEMON Mon Nov 16 06:05:42 2009
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1N9zOw-0007fj-F7
	for mharc-commit-inetutils@gnu.org; Mon, 16 Nov 2009 06:05:42 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N9zOu-0007eN-18
	for commit-inetutils@gnu.org; Mon, 16 Nov 2009 06:05:40 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N9zOr-0007d4-Ta
	for commit-inetutils@gnu.org; Mon, 16 Nov 2009 06:05:39 -0500
Received: from [199.232.76.173] (port=37517 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N9zOr-0007cz-Ft
	for commit-inetutils@gnu.org; Mon, 16 Nov 2009 06:05:37 -0500
Received: from savannah.gnu.org ([199.232.41.3]:51540 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 1N9zOr-0001ri-0v
	for commit-inetutils@gnu.org; Mon, 16 Nov 2009 06:05:37 -0500
Received: from [10.1.0.109] (helo=cvs.savannah.gnu.org)
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <simon@josefsson.org>) id 1N9zOp-0000KH-EJ
	for commit-inetutils@gnu.org; Mon, 16 Nov 2009 11:05:35 +0000
Received: from jas by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <jas@savannah.gnu.org>) id 1N9zOp-0000Jp-1p
	for commit-inetutils@gnu.org; Mon, 16 Nov 2009 11:05:35 +0000
To: commit-inetutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 50ec75e55a23457ff607d56a311686afac06a044
X-Git-Newrev: fa90ce485a5ff1193473eafd2232716ba50c5cbe
Message-Id: <E1N9zOp-0000Jp-1p@cvs.savannah.gnu.org>
From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 16 Nov 2009 11:05:35 +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_6-100-gfa90ce4
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: Mon, 16 Nov 2009 11:05:40 -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  fa90ce485a5ff1193473eafd2232716ba50c5cbe (commit)
      from  50ec75e55a23457ff607d56a311686afac06a044 (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=fa90ce485a5ff1193473eafd2232716ba50c5cbe


commit fa90ce485a5ff1193473eafd2232716ba50c5cbe
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Nov 16 12:05:31 2009 +0100

    Fix ping/traceroute self-tests.

diff --git a/ChangeLog b/ChangeLog
index 5460065..cd986cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-11-16  Simon Josefsson  <simon@josefsson.org>
 
+	* tests/ping-localhost.sh: Call the right executable.  Support
+	EXEEXT.  Fix license header.
+	* tests/traceroute-localhost.sh: Likewise.
+	* tests/Makefile.am: Set EXEEXT, for Windows builds.
+
+2009-11-16  Simon Josefsson  <simon@josefsson.org>
+
 	* configure.ac: Don't call AB_INIT here too, it is already invoked
 	via gnulib.  Reported by Alfred M. Szmidt <ams@gnu.org>.
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4adf3f0..1813a98 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,3 +22,5 @@ LDADD = -L../libinetutils -linetutils
 
 check_PROGRAMS = localhost
 TESTS = $(check_PROGRAMS) ping-localhost.sh traceroute-localhost.sh
+
+TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
diff --git a/tests/ping-localhost.sh b/tests/ping-localhost.sh
index 4be2a02..a53b3a7 100755
--- a/tests/ping-localhost.sh
+++ b/tests/ping-localhost.sh
@@ -1,8 +1,27 @@
 #!/bin/sh
 
+# Copyright (C) 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/'.
+
+PING=${PING:-../ping/ping$EXEEXT}
+
 if [ $VERBOSE ]; then
     set -x
-    ping --version
+    $PING --version
 fi
 
 if [ `id -u` != 0 ]; then
@@ -10,6 +29,6 @@ if [ `id -u` != 0 ]; then
     exit 77
 fi
 
-ping -c 1 127.0.0.1; errno=$?
+$PING -c 1 127.0.0.1; errno=$?
 
 exit $errno
diff --git a/tests/traceroute-localhost.sh b/tests/traceroute-localhost.sh
index 79f2cc6..46599aa 100755
--- a/tests/traceroute-localhost.sh
+++ b/tests/traceroute-localhost.sh
@@ -1,8 +1,27 @@
 #!/bin/sh
 
+# Copyright (C) 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/'.
+
+TRACEROUTE=${TRACEROUTE:-../traceroute/traceroute$EXEEXT}
+
 if [ $VERBOSE ]; then
     set -x
-    traceroute --version
+    $TRACEROUTE --version
 fi
 
 if [ `id -u` != 0 ]; then
@@ -10,6 +29,6 @@ if [ `id -u` != 0 ]; then
     exit 77
 fi
 
-traceroute 127.0.0.1; errno=$?
+$TRACEROUTE 127.0.0.1; errno=$?
 
 exit $errno

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

Summary of changes:
 ChangeLog                     |    7 +++++++
 tests/Makefile.am             |    2 ++
 tests/ping-localhost.sh       |   23 +++++++++++++++++++++--
 tests/traceroute-localhost.sh |   23 +++++++++++++++++++++--
 4 files changed, 51 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 



