X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fgetusershell.c;h=fa1b1202dc9891fddfb32b2ab803bb5cbc81a771;hb=47ce26fc9f5632c8b9b58999fe0484100a51289d;hp=a75d4fd4862d1f7b3077877058a9ec4a95f5f70d;hpb=4fde4952d5a3db51a122f96a31bfcd6879399fea;p=gnulib.git

diff --git a/lib/getusershell.c b/lib/getusershell.c
index a75d4fd48..fa1b1202d 100644
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -3,10 +3,10 @@
    Copyright (C) 1991, 1997, 2000, 2001, 2003, 2004, 2005, 2006 Free
    Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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 2, 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
@@ -14,14 +14,11 @@
    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 David MacKenzie <djm@gnu.ai.mit.edu> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #ifndef SHELLS_FILE
 # ifndef __DJGPP__