license cleanup

12 files changed, 113 insertions, 43 deletions

diff --git a/src/consoletype.c b/src/consoletype.c
index ab7e7534..82d3f6ab 100644
--- a/src/consoletype.c
+++ b/src/consoletype.c
@@ -1,12 +1,18 @@
 /*
  * Copyright (c) 1999-2003 Red Hat, Inc. All rights reserved.
  *
- * This software may be freely redistributed under the terms of the GNU
- * public license.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2,
+ * as published by the Free Software Foundation.
+ *
+ * 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.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
  */
 
diff --git a/src/doexec.c b/src/doexec.c
index 1b045326..3e8d9f4e 100644
--- a/src/doexec.c
+++ b/src/doexec.c
@@ -1,13 +1,18 @@
 /*
  * Copyright (c) 1997-1999 Red Hat, Inc. All rights reserved.
  *
- * This software may be freely redistributed under the terms of the GNU
- * public license.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2,
+ * as published by the Free Software Foundation.
+ *
+ * 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.
- *
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
 #include <unistd.h>
diff --git a/src/genhostid.c b/src/genhostid.c
index a56cad83..5afb764d 100644
--- a/src/genhostid.c
+++ b/src/genhostid.c
@@ -1,11 +1,17 @@
 /* Copyright (C) 2003 Red Hat, Inc.
  *
- * This software may be freely redistributed under the terms of the GNU
- * public license.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2,
+ * as published by the Free Software Foundation.
+ *
+ * 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.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *         
  */
 
diff --git a/src/getkey.c b/src/getkey.c
index f3b094d7..11496260 100644
--- a/src/getkey.c
+++ b/src/getkey.c
@@ -1,13 +1,19 @@
 /*

  * Copyright (c) 1999-2003, 2006 Red Hat, Inc. All rights reserved.

  *

- * This software may be freely redistributed under the terms of the GNU

- * public license.

- *

- * 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.

- *

+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2,
+ * as published by the Free Software Foundation.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

+ *
  * getkey

  *

  * A very simple keygrabber.

diff --git a/src/initlog.c b/src/initlog.c
index be98ebe0..e42960a8 100644
--- a/src/initlog.c
+++ b/src/initlog.c
@@ -1,12 +1,18 @@
 /*
  * Copyright (c) 1999-2003 Red Hat, Inc. All rights reserved.
  *
- * This software may be freely redistributed under the terms of the GNU
- * public license.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2,
+ * as published by the Free Software Foundation.
+ *
+ * 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.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
  */
 
diff --git a/src/ipcalc.c b/src/ipcalc.c
index f133412c..9497b8ef 100644
--- a/src/ipcalc.c
+++ b/src/ipcalc.c
@@ -1,12 +1,18 @@
 /*
  * Copyright (c) 1997-2003 Red Hat, Inc. All rights reserved.
  *
- * This software may be freely redistributed under the terms of the GNU
- * public license.
- * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2,
+ * as published by the Free Software Foundation.
+ *
+ * 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.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
  * Authors:
  *   Erik Troan <ewt@redhat.com>
diff --git a/src/kmodule.c b/src/kmodule.c
index 01db7666..51ca778d 100644
--- a/src/kmodule.c
+++ b/src/kmodule.c
@@ -1,12 +1,17 @@
 /* Copyright 2004 Red Hat, Inc.
  *
- * This software may be freely redistributed under the terms of the GNU
- * public license.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2,
+ * as published by the Free Software Foundation.
+ *
+ * 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.
- *
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
 #include <ctype.h>
diff --git a/src/minilogd.c b/src/minilogd.c
index 85430978..453431dc 100644
--- a/src/minilogd.c
+++ b/src/minilogd.c
@@ -5,12 +5,18 @@
  *
  * Copyright (c) 1999-2001 Red Hat, Inc. All rights reserved.
  *
- * This software may be freely redistributed under the terms of the GNU
- * public license.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2,
+ * as published by the Free Software Foundation.
+ *
+ * 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.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
  */
 
diff --git a/src/netreport.c b/src/netreport.c
index 6eb220c6..a2b2625c 100644
--- a/src/netreport.c
+++ b/src/netreport.c
@@ -1,12 +1,18 @@
 /*
  * Copyright (c) 1997-2002 Red Hat, Inc. All rights reserved.
  *
- * This software may be freely redistributed under the terms of the GNU
- * public license.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2,
+ * as published by the Free Software Foundation.
+ *
+ * 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.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
  */
 #include <errno.h>
diff --git a/src/process.c b/src/process.c
index 475d188b..ef70bf96 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,12 +1,18 @@
 /*
  * Copyright (c) 1999-2003 Red Hat, Inc. All rights reserved.
  *
- * This software may be freely redistributed under the terms of the GNU
- * public license.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2,
+ * as published by the Free Software Foundation.
+ *
+ * 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.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
  */
 
diff --git a/src/usernetctl.c b/src/usernetctl.c
index be69c022..5a35a446 100644
--- a/src/usernetctl.c
+++ b/src/usernetctl.c
@@ -1,12 +1,18 @@
 /*
  * Copyright (c) 1997-2003 Red Hat, Inc. All rights reserved.
  *
- * This software may be freely redistributed under the terms of the GNU
- * public license.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2,
+ * as published by the Free Software Foundation.
+ *
+ * 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.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
  */
 
diff --git a/src/usleep.c b/src/usleep.c
index f00b6f15..0409498d 100644
--- a/src/usleep.c
+++ b/src/usleep.c
@@ -5,12 +5,18 @@
  * 
  * Copyright (c) 1997-2003 Red Hat, Inc. All rights reserved.
  *
- * This software may be freely redistributed under the terms of the GNU
- * public license.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2,
+ * as published by the Free Software Foundation.
+ *
+ * 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.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
  */