[bug-inetutils] Re: telnet cleanup

[Simon Josefsson]

"Alfred M. Szmidt" <address@hidden> writes:

>    > Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 2003, 2004, 2005
>    >               2006, 2007, 2008, 2009 Free Software Foundation, Inc.
>    >
>    > Since we added the file in 1997 from BSD4.4-Lite, and we have
>    > done changes in inetutils each year since then.
>
>    Ah.  Would you like to commit this fix should I?  Relevant files
>    are libtelnet/{auth,enc_des,encrypt,misc}.c.  Or maybe just do it
>    for all of libtelnet/.
>
> If you can do it, then it would be wonderful.  Otherwise, I'll try too
> see if I can get some time to eiither resurrect my old patch, or just
> do it anew.

I have applied the patch below, for files in libtelnet/.  Files were
added in 1996, so I added that year to your list above.

I'll sent an updated patch to fix the compiler warnings next.

/Simon

Index: auth-proto.h
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/auth-proto.h,v
retrieving revision 1.6
diff -u -p -r1.6 auth-proto.h
--- auth-proto.h        21 Oct 2006 15:24:20 -0000      1.6
+++ auth-proto.h        10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: auth.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/auth.c,v
retrieving revision 1.10
diff -u -p -r1.10 auth.c
--- auth.c      21 Oct 2006 18:08:45 -0000      1.10
+++ auth.c      10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: auth.h
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/auth.h,v
retrieving revision 1.8
diff -u -p -r1.8 auth.h
--- auth.h      27 Dec 2008 20:35:57 -0000      1.8
+++ auth.h      10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: enc-proto.h
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/enc-proto.h,v
retrieving revision 1.4
diff -u -p -r1.4 enc-proto.h
--- enc-proto.h 21 Oct 2006 15:24:20 -0000      1.4
+++ enc-proto.h 10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: enc_des.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/enc_des.c,v
retrieving revision 1.10
diff -u -p -r1.10 enc_des.c
--- enc_des.c   4 Jun 2007 17:27:40 -0000       1.10
+++ enc_des.c   10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: encrypt.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/encrypt.c,v
retrieving revision 1.10
diff -u -p -r1.10 encrypt.c
--- encrypt.c   4 Jun 2007 17:27:02 -0000       1.10
+++ encrypt.c   10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: encrypt.h
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/encrypt.h,v
retrieving revision 1.5
diff -u -p -r1.5 encrypt.h
--- encrypt.h   21 Oct 2006 15:24:20 -0000      1.5
+++ encrypt.h   10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: forward.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/forward.c,v
retrieving revision 1.6
diff -u -p -r1.6 forward.c
--- forward.c   21 Oct 2006 18:08:45 -0000      1.6
+++ forward.c   10 Jun 2009 09:42:01 -0000
@@ -1,7 +1,23 @@
 /*
- *    $Source: /sources/inetutils/inetutils/libtelnet/forward.c,v $
- *    $Id: forward.c,v 1.6 2006/10/21 18:08:45 ams Exp $
- */
+  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) 1993
Index: genget.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/genget.c,v
retrieving revision 1.7
diff -u -p -r1.7 genget.c
--- genget.c    21 Oct 2006 18:08:45 -0000      1.7
+++ genget.c    10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: getent.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/getent.c,v
retrieving revision 1.10
diff -u -p -r1.10 getent.c
--- getent.c    21 Oct 2006 18:08:45 -0000      1.10
+++ getent.c    10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: kerberos.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/kerberos.c,v
retrieving revision 1.10
diff -u -p -r1.10 kerberos.c
--- kerberos.c  4 Jun 2007 17:27:02 -0000       1.10
+++ kerberos.c  10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: kerberos5.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/kerberos5.c,v
retrieving revision 1.11
diff -u -p -r1.11 kerberos5.c
--- kerberos5.c 29 Jun 2007 16:29:31 -0000      1.11
+++ kerberos5.c 10 Jun 2009 09:42:01 -0000
@@ -1,21 +1,22 @@
-/* Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+/*
+  Copyright (C) 2002, 2007 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 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. */
+  GNU InetUtils is free software: you can redistribute 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>
Index: key-proto.h
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/key-proto.h,v
retrieving revision 1.4
diff -u -p -r1.4 key-proto.h
--- key-proto.h 21 Oct 2006 15:24:20 -0000      1.4
+++ key-proto.h 10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: misc-proto.h
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/misc-proto.h,v
retrieving revision 1.4
diff -u -p -r1.4 misc-proto.h
--- misc-proto.h        21 Oct 2006 15:24:20 -0000      1.4
+++ misc-proto.h        10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: misc.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/misc.c,v
retrieving revision 1.8
diff -u -p -r1.8 misc.c
--- misc.c      21 Oct 2006 18:08:45 -0000      1.8
+++ misc.c      10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: misc.h
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/misc.h,v
retrieving revision 1.2
diff -u -p -r1.2 misc.h
--- misc.h      6 Jul 2000 04:21:08 -0000       1.2
+++ misc.h      10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1991, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: read_passwd.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/read_passwd.c,v
retrieving revision 1.7
diff -u -p -r1.7 read_passwd.c
--- read_passwd.c       21 Oct 2006 18:08:45 -0000      1.7
+++ read_passwd.c       10 Jun 2009 09:42:01 -0000
@@ -1,3 +1,24 @@
+/*
+  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) 1992, 1993
  *     The Regents of the University of California.  All rights reserved.
Index: shishi.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/shishi.c,v
retrieving revision 1.5
diff -u -p -r1.5 shishi.c
--- shishi.c    6 Feb 2008 20:44:46 -0000       1.5
+++ shishi.c    10 Jun 2009 09:42:01 -0000
@@ -1,21 +1,23 @@
-/* Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
-
-This file is part of Shishi / GNU Inetutils.
-
-Shishi is free software; you can redistribute 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.
-
-Shishi 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 Shishi; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+/*
+  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 distributed in the hope that 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 Simon Josefsson and Nicolas Pouvesle, based on
    kerberos5.c from GNU InetUtils. */