Author: Chad Naugle <chad.naugle@travimp.com>

Correct GPLv2+ clauses on ext_edirectory_userip_acl helper

Reference: http://bugs.squid-cache.org/show_bug.cgi?id=2905

comment #6: 2010-04-20 07:53:34 MDT

(In reply to comment #5)
> Unfortunately GPLv2+ and GPLv3 do not mix entirely well, unless we consider
> bundling the helper mere aggregation and not integrated.
>
> also, why can't you use the LDAP for matching the attribute instead of having
> to retreive all possible users and then compare the networkAddress "manually"?

I'll swap out the GPLv3 into GPLv2, no biggie.  All I've done was add the files
and clauses so far.  I'm just searching to see if there is something I am
missing for that.

comment #10: 2010-04-20 14:51:14 MDT

Created attachment 2139 [details]
v1.2 GPLv2+ version

diff --git a/helpers/external_acl/eDirectory_userip/config.test b/helpers/external_acl/eDirectory_userip/config.test
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/helpers/external_acl/eDirectory_userip/edui_config.h b/helpers/external_acl/eDirectory_userip/edui_config.h
index f8239cb17c5b94f0a151928bb0a0781d75c8c649..6a989af0a27bb14d50e308381a24cb4297a02193 100644 (file)
--- a/helpers/external_acl/eDirectory_userip/edui_config.h
+++ b/helpers/external_acl/eDirectory_userip/edui_config.h
@@ -6,7 +6,7 @@
  *
  *  squid_edir_iplookup 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
+ *  the Free Software Foundation, either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  squid_edir_iplookup is distributed in the hope that it will be useful,

diff --git a/helpers/external_acl/eDirectory_userip/edui_util.c b/helpers/external_acl/eDirectory_userip/edui_util.c
index 97624d4f6c4f558da18673e16e34d61b5b032b30..ecbde6b3e7aae537e1903de4991aa45eb450b5e7 100644 (file)
--- a/helpers/external_acl/eDirectory_userip/edui_util.c
+++ b/helpers/external_acl/eDirectory_userip/edui_util.c
@@ -6,7 +6,7 @@
  *
  *  squid_edir_iplookup 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
+ *  the Free Software Foundation, either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  squid_edir_iplookup is distributed in the hope that it will be useful,

diff --git a/helpers/external_acl/eDirectory_userip/edui_util.h b/helpers/external_acl/eDirectory_userip/edui_util.h
index 92f395f276a1288f4e8c212e8e4ffc385164d8fe..316c2ac10185049e6560215938c1f902e6937cd7 100644 (file)
--- a/helpers/external_acl/eDirectory_userip/edui_util.h
+++ b/helpers/external_acl/eDirectory_userip/edui_util.h
@@ -6,7 +6,7 @@
  *
  *  squid_edir_iplookup 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
+ *  the Free Software Foundation, either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  squid_edir_iplookup is distributed in the hope that it will be useful,

diff --git a/helpers/external_acl/eDirectory_userip/iplookup.c b/helpers/external_acl/eDirectory_userip/iplookup.c
index a94fae55831a2e365e393382f54e88ef140d9f9d..e3acfa4a2ff983059e47bbd29b68f004af02cdcd 100644 (file)
--- a/helpers/external_acl/eDirectory_userip/iplookup.c
+++ b/helpers/external_acl/eDirectory_userip/iplookup.c
@@ -6,7 +6,7 @@
  *
  *  squid_edir_iplookup 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
+ *  the Free Software Foundation, either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  squid_edir_iplookup is distributed in the hope that it will be useful,

diff --git a/helpers/external_acl/eDirectory_userip/iplookup.h b/helpers/external_acl/eDirectory_userip/iplookup.h
index c085715237c6b4610d3b05c26a32166c5d954844..5c400ba843062787954d2e70b2ce4f06179aac86 100644 (file)
--- a/helpers/external_acl/eDirectory_userip/iplookup.h
+++ b/helpers/external_acl/eDirectory_userip/iplookup.h
@@ -6,7 +6,7 @@
  *
  *  squid_edir_iplookup 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
+ *  the Free Software Foundation, either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  squid_edir_iplookup is distributed in the hope that it will be useful,

diff --git a/helpers/external_acl/eDirectory_userip/main.c b/helpers/external_acl/eDirectory_userip/main.c
index 07df10f97153e95d4ee7e10299b14422f7dc9432..6d7f3124c170f7aabea51c0d45b1731fe7a49464 100644 (file)
--- a/helpers/external_acl/eDirectory_userip/main.c
+++ b/helpers/external_acl/eDirectory_userip/main.c
@@ -6,7 +6,7 @@
  *
  *  squid_edir_iplookup 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
+ *  the Free Software Foundation, either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  squid_edir_iplookup is distributed in the hope that it will be useful,

diff --git a/helpers/external_acl/eDirectory_userip/main.h b/helpers/external_acl/eDirectory_userip/main.h
index 9764f7783ef92d4707fab2959f68dfab768b6a62..bde6a84beed55609cb7ee1ee54227c5d18d38fb3 100644 (file)
--- a/helpers/external_acl/eDirectory_userip/main.h
+++ b/helpers/external_acl/eDirectory_userip/main.h
@@ -6,7 +6,7 @@
  *
  *  squid_edir_iplookup 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
+ *  the Free Software Foundation, either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  squid_edir_iplookup is distributed in the hope that it will be useful,