From c1946e40c2900ecf8dfe389a9e899ca56dd0fe60 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Wed, 3 Jun 2015 11:24:30 -0400 Subject: [PATCH] Fix LGPL text broken by 1af9582b2 --- src/include/exfile.h | 3 +-- src/include/libradius.h | 3 +-- src/include/net.h | 5 ++--- src/include/pcap.h | 5 ++--- src/include/radsniff.h | 5 ++--- src/include/regex.h | 3 +-- src/include/threads.h | 3 +-- src/lib/cursor.c | 5 ++--- src/lib/dict.c | 3 +-- src/lib/event.c | 3 +-- src/lib/fifo.c | 3 +-- src/lib/filters.c | 3 +-- src/lib/hash.c | 3 +-- src/lib/hmacmd5.c | 3 +-- src/lib/log.c | 3 +-- src/lib/misc.c | 3 +-- src/lib/missing.c | 3 +-- src/lib/net.c | 5 ++--- src/lib/packet.c | 3 +-- src/lib/pair.c | 3 +-- src/lib/pcap.c | 5 ++--- src/lib/print.c | 3 +-- src/lib/radius.c | 3 +-- src/lib/token.c | 3 +-- src/lib/udpfromto.c | 3 +-- src/lib/value.c | 3 +-- src/modules/proto_dhcp/dhcp.c | 3 +-- src/modules/proto_vmps/vqp.c | 3 +-- 28 files changed, 34 insertions(+), 62 deletions(-) diff --git a/src/include/exfile.h b/src/include/exfile.h index 1edafb3f859..ccccfe97e68 100644 --- a/src/include/exfile.h +++ b/src/include/exfile.h @@ -1,8 +1,7 @@ /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/include/libradius.h b/src/include/libradius.h index 014c92aea08..e751278f65b 100644 --- a/src/include/libradius.h +++ b/src/include/libradius.h @@ -1,8 +1,7 @@ /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/include/net.h b/src/include/net.h index e314ab8c119..ef4205dfe53 100644 --- a/src/include/net.h +++ b/src/include/net.h @@ -2,9 +2,8 @@ #define FR_NET_H /* * This program is is free software; you can 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. + * it under the terms of the GNU General Public License, version 2 of 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 diff --git a/src/include/pcap.h b/src/include/pcap.h index 77ac7e691a2..6444943ca29 100644 --- a/src/include/pcap.h +++ b/src/include/pcap.h @@ -3,9 +3,8 @@ #ifdef HAVE_LIBPCAP /* * This program is is free software; you can 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. + * it under the terms of the GNU General Public License, version 2 of 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 diff --git a/src/include/radsniff.h b/src/include/radsniff.h index 0d9a9ec0c40..c909ecdf073 100644 --- a/src/include/radsniff.h +++ b/src/include/radsniff.h @@ -1,8 +1,7 @@ /* * This program is is free software; you can 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. + * it under the terms of the GNU General Public License, version 2 of 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 diff --git a/src/include/regex.h b/src/include/regex.h index 379650c605e..efb7b8615cb 100644 --- a/src/include/regex.h +++ b/src/include/regex.h @@ -1,8 +1,7 @@ /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/include/threads.h b/src/include/threads.h index 1c9a59b907b..4548b7bb95f 100644 --- a/src/include/threads.h +++ b/src/include/threads.h @@ -3,8 +3,7 @@ /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/cursor.c b/src/lib/cursor.c index bb83382c44d..f7ed12a0921 100644 --- a/src/lib/cursor.c +++ b/src/lib/cursor.c @@ -1,8 +1,7 @@ /* * This program is is free software; you can 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. + * it under the terms of the GNU General Public License, version 2 of 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 diff --git a/src/lib/dict.c b/src/lib/dict.c index 697322c4f68..7a179746672 100644 --- a/src/lib/dict.c +++ b/src/lib/dict.c @@ -5,8 +5,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/event.c b/src/lib/event.c index 6f1dbc43845..fa1e0aa0daf 100644 --- a/src/lib/event.c +++ b/src/lib/event.c @@ -6,8 +6,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/fifo.c b/src/lib/fifo.c index fdea2c611e7..b71fc5113bb 100644 --- a/src/lib/fifo.c +++ b/src/lib/fifo.c @@ -6,8 +6,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/filters.c b/src/lib/filters.c index d6e34e0c4f9..69187f906aa 100644 --- a/src/lib/filters.c +++ b/src/lib/filters.c @@ -5,8 +5,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/hash.c b/src/lib/hash.c index 7d91e078213..9810431c654 100644 --- a/src/lib/hash.c +++ b/src/lib/hash.c @@ -15,8 +15,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/hmacmd5.c b/src/lib/hmacmd5.c index 5b2c923e172..2c662ff368e 100644 --- a/src/lib/hmacmd5.c +++ b/src/lib/hmacmd5.c @@ -6,8 +6,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/log.c b/src/lib/log.c index 46f7a131721..b0a978e5461 100644 --- a/src/lib/log.c +++ b/src/lib/log.c @@ -6,8 +6,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/misc.c b/src/lib/misc.c index 2af61a40ee4..360b13e8b70 100644 --- a/src/lib/misc.c +++ b/src/lib/misc.c @@ -5,8 +5,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/missing.c b/src/lib/missing.c index 7f8cebda34b..4c45fb40b10 100644 --- a/src/lib/missing.c +++ b/src/lib/missing.c @@ -6,8 +6,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/net.c b/src/lib/net.c index 2d9be5839a0..2981bc1f073 100644 --- a/src/lib/net.c +++ b/src/lib/net.c @@ -1,8 +1,7 @@ /* * This program is is free software; you can 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. + * it under the terms of the GNU General Public License, version 2 of 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 diff --git a/src/lib/packet.c b/src/lib/packet.c index a079702a294..65c3bdfe3c4 100644 --- a/src/lib/packet.c +++ b/src/lib/packet.c @@ -5,8 +5,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/pair.c b/src/lib/pair.c index 6e366e4b24b..24d193e6cc0 100644 --- a/src/lib/pair.c +++ b/src/lib/pair.c @@ -5,8 +5,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/pcap.c b/src/lib/pcap.c index cfb9f5d81c9..00ccd52aa2f 100644 --- a/src/lib/pcap.c +++ b/src/lib/pcap.c @@ -1,8 +1,7 @@ /* * This program is is free software; you can 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. + * it under the terms of the GNU General Public License, version 2 of 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 diff --git a/src/lib/print.c b/src/lib/print.c index a7c813c91e8..c2b50882be5 100644 --- a/src/lib/print.c +++ b/src/lib/print.c @@ -5,8 +5,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/radius.c b/src/lib/radius.c index 045143da520..2abd7689e4a 100644 --- a/src/lib/radius.c +++ b/src/lib/radius.c @@ -1,8 +1,7 @@ /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/token.c b/src/lib/token.c index 242e4a3540b..3907908a162 100644 --- a/src/lib/token.c +++ b/src/lib/token.c @@ -6,8 +6,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/udpfromto.c b/src/lib/udpfromto.c index 75c5c0e1336..ce0147da326 100644 --- a/src/lib/udpfromto.c +++ b/src/lib/udpfromto.c @@ -1,8 +1,7 @@ /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/lib/value.c b/src/lib/value.c index 8fdbc00ccf9..046ddd42811 100644 --- a/src/lib/value.c +++ b/src/lib/value.c @@ -5,8 +5,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/modules/proto_dhcp/dhcp.c b/src/modules/proto_dhcp/dhcp.c index b21cd1e345b..0d78913db81 100644 --- a/src/modules/proto_dhcp/dhcp.c +++ b/src/modules/proto_dhcp/dhcp.c @@ -5,8 +5,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, diff --git a/src/modules/proto_vmps/vqp.c b/src/modules/proto_vmps/vqp.c index 72cc904e053..a409b98c5e1 100644 --- a/src/modules/proto_vmps/vqp.c +++ b/src/modules/proto_vmps/vqp.c @@ -5,8 +5,7 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. either + * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, -- 2.47.3