Paul Hampson wrote: [...]
> > /* > > * rlm_acct_unique.c > > * > > - * This program is 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, version 2 if the > > * License as published by the Free Software Foundation. > > * > > Is there a reason you let that (for example) "version 2 if the" ride > but fixed I'm an idiot. My script didn't grep the GPL header and I thought "oh there's a typo in the first line". But as you noticed the following lines are broken too. I've corrected this and made (once again) a new patch. $ cvs diff -u src/modules/rlm_acct_unique/rlm_acct_unique.c src/modules/rlm_always/rlm_always.c src/modules/rlm_attr_filter/rlm_attr_filter.c src/modules/rlm_dbm/rlm_dbm.c src/modules/rlm_dbm/rlm_dbm_cat.c src/modules/rlm_dbm/rlm_dbm_parser.c src/modules/rlm_detail/rlm_detail.c src/modules/rlm_unix/cache.c src/modules/rlm_unix/compat.c Index: src/modules/rlm_acct_unique/rlm_acct_unique.c =================================================================== RCS file: /source/radiusd/src/modules/rlm_acct_unique/rlm_acct_unique.c,v retrieving revision 1.27 diff -u -r1.27 rlm_acct_unique.c --- src/modules/rlm_acct_unique/rlm_acct_unique.c 3 Dec 2002 16:27:37 -0000 1.27 +++ src/modules/rlm_acct_unique/rlm_acct_unique.c 11 Sep 2003 10:08:51 -0000 @@ -1,18 +1,19 @@ /* * rlm_acct_unique.c * - * This program is is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 if the - * License 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. + * 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 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. + * + * 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 * * Copyright 2000 The FreeRADIUS server project */ Index: src/modules/rlm_always/rlm_always.c =================================================================== RCS file: /source/radiusd/src/modules/rlm_always/rlm_always.c,v retrieving revision 1.10 diff -u -r1.10 rlm_always.c --- src/modules/rlm_always/rlm_always.c 14 Jul 2003 17:27:34 -0000 1.10 +++ src/modules/rlm_always/rlm_always.c 11 Sep 2003 10:08:51 -0000 @@ -1,18 +1,19 @@ /* * rlm_always.c * - * This program is is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 if the - * License 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. + * 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 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. + * + * 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 * * Copyright 2000 The FreeRADIUS server project */ Index: src/modules/rlm_attr_filter/rlm_attr_filter.c =================================================================== RCS file: /source/radiusd/src/modules/rlm_attr_filter/rlm_attr_filter.c,v retrieving revision 1.13 diff -u -r1.13 rlm_attr_filter.c --- src/modules/rlm_attr_filter/rlm_attr_filter.c 7 Jul 2003 19:04:05 -0000 1.13 +++ src/modules/rlm_attr_filter/rlm_attr_filter.c 11 Sep 2003 10:08:51 -0000 @@ -5,15 +5,16 @@ * * Version: $Id: rlm_attr_filter.c,v 1.13 2003/07/07 19:04:05 aland Exp $ * - * This program is is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 if the - * License as published by the Free Software Foundation. - * + * 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 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. - * + * * 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. Index: src/modules/rlm_dbm/rlm_dbm.c =================================================================== RCS file: /source/radiusd/src/modules/rlm_dbm/rlm_dbm.c,v retrieving revision 1.6 diff -u -r1.6 rlm_dbm.c --- src/modules/rlm_dbm/rlm_dbm.c 7 Jul 2003 19:05:14 -0000 1.6 +++ src/modules/rlm_dbm/rlm_dbm.c 11 Sep 2003 10:08:51 -0000 @@ -3,18 +3,22 @@ * * Version: $Id: rlm_dbm.c,v 1.6 2003/07/07 19:05:14 aland Exp $ * - * This program is is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 if the - * License as published by the Free Software Foundation. + * 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 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. + * 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. * - * Copyright 2001 Koulik Andrei, Sandy Service + * 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 + * + * Copyright 2001 Koulik Andrei, Sandy Service */ - #include <string.h> #include <stdlib.h> Index: src/modules/rlm_dbm/rlm_dbm_cat.c =================================================================== RCS file: /source/radiusd/src/modules/rlm_dbm/rlm_dbm_cat.c,v retrieving revision 1.6 diff -u -r1.6 rlm_dbm_cat.c --- src/modules/rlm_dbm/rlm_dbm_cat.c 14 May 2003 08:48:12 -0000 1.6 +++ src/modules/rlm_dbm/rlm_dbm_cat.c 11 Sep 2003 10:08:51 -0000 @@ -3,17 +3,21 @@ * * Version: $Id: rlm_dbm_cat.c,v 1.6 2003/05/14 08:48:12 wichert Exp $ * - * This program is is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 if the - * License as published by the Free Software Foundation. + * 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 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. + * 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 * - * Copyright 2001 Koulik Andrei, Sandy Service + * Copyright 2001 Koulik Andrei, Sandy Service */ #include "autoconf.h" Index: src/modules/rlm_dbm/rlm_dbm_parser.c =================================================================== RCS file: /source/radiusd/src/modules/rlm_dbm/rlm_dbm_parser.c,v retrieving revision 1.7 diff -u -r1.7 rlm_dbm_parser.c --- src/modules/rlm_dbm/rlm_dbm_parser.c 26 Jun 2003 15:08:29 -0000 1.7 +++ src/modules/rlm_dbm/rlm_dbm_parser.c 11 Sep 2003 10:08:51 -0000 @@ -3,16 +3,21 @@ * * Version: $Id: rlm_dbm_parser.c,v 1.7 2003/06/26 15:08:29 aland Exp $ * - * This program is is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 if the - * License as published by the Free Software Foundation. + * 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 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. + * 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. * - * Copyright 2001 Koulik Andrei, Sandy Service + * 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 + * + * Copyright 2001 Koulik Andrei, Sandy Service */ Index: src/modules/rlm_detail/rlm_detail.c =================================================================== RCS file: /source/radiusd/src/modules/rlm_detail/rlm_detail.c,v retrieving revision 1.31 diff -u -r1.31 rlm_detail.c --- src/modules/rlm_detail/rlm_detail.c 11 Aug 2003 17:06:51 -0000 1.31 +++ src/modules/rlm_detail/rlm_detail.c 11 Sep 2003 10:08:51 -0000 @@ -3,18 +3,19 @@ * * Version: $Id: rlm_detail.c,v 1.31 2003/08/11 17:06:51 aland Exp $ * - * This program is is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 if the - * License 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. + * 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 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. + * + * 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 * * Copyright 2000 The FreeRADIUS server project */ Index: src/modules/rlm_unix/cache.c =================================================================== RCS file: /source/radiusd/src/modules/rlm_unix/cache.c,v retrieving revision 1.23 diff -u -r1.23 cache.c --- src/modules/rlm_unix/cache.c 3 Sep 2003 15:19:32 -0000 1.23 +++ src/modules/rlm_unix/cache.c 11 Sep 2003 10:08:52 -0000 @@ -13,15 +13,16 @@ * * Version: $Id: cache.c,v 1.23 2003/09/03 15:19:32 cparker Exp $ * - * This program is is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 if the - * License as published by the Free Software Foundation. - * + * 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 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. - * + * * 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. Index: src/modules/rlm_unix/compat.c =================================================================== RCS file: /source/radiusd/src/modules/rlm_unix/compat.c,v retrieving revision 1.2 diff -u -r1.2 compat.c --- src/modules/rlm_unix/compat.c 3 Sep 2003 15:19:32 -0000 1.2 +++ src/modules/rlm_unix/compat.c 11 Sep 2003 10:08:52 -0000 @@ -6,15 +6,16 @@ * * Version: $Id: compat.c,v 1.2 2003/09/03 15:19:32 cparker Exp $ * - * This program is is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2 if the - * License as published by the Free Software Foundation. - * + * 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 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. - * + * * 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. -- Nicolas Baradakis - List info/subscribe/unsubscribe? See http://www.freeradius.org/list/users.html
