Update ISC license wording.

See: http://en.wikipedia.org/wiki/ISC_license

diff --git a/README.md b/README.md
index 8eef6da3160da754167dc2c3e82c2c6f666351f1..f33ca980a958f724f9e795b4f2cb900251b3a029 100644 (file)
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ More information:
 
 lldpd is distributed under the following license:
 
- > Permission to use, copy, modify, and distribute this software for any
+ > Permission to use, copy, modify, and/or distribute this software for any
  > purpose with or without fee is hereby granted, provided that the above
  > copyright notice and this permission notice appear in all copies.
  >

diff --git a/debian/copyright b/debian/copyright
index c76687e4fcdaba7fe38a9d46930be08d7b0453ed..bf3f7dc9a4efb5d50cdbc9993ec527618bc59ea9 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Copyright: © 2008 Vincent Bernat <bernat@luffy.cx>
            © 2003 Can Erkin Acar
            © 2003 Anil Madhavapeddy <anil@recoil.org>
 License: MIT
- Permission to use, copy, modify, and distribute this software for any
+ Permission to use, copy, modify, and/or distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
  copyright notice and this permission notice appear in all copies.
 

diff --git a/man/lldpctl.8 b/man/lldpctl.8
index eb7040d53451dbc9571a53d52787cba3566e7701..9025632e4d63685db154b8bbe6c639545ba7bc8d 100644 (file)
--- a/man/lldpctl.8
+++ b/man/lldpctl.8
@@ -1,7 +1,7 @@
 .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
 .\" Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
 .\"
-.\" Permission to use, copy, modify, and distribute this software for any
+.\" Permission to use, copy, modify, and/or distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies.
 .\"

diff --git a/man/lldpd.8 b/man/lldpd.8
index 3df1d5d79c0882d3bda9f59dc6e3d608d299e524..6d5fcbce9513a4c7a83038febf7d9933ee5438b7 100644 (file)
--- a/man/lldpd.8
+++ b/man/lldpd.8
@@ -1,7 +1,7 @@
 .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
 .\" Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
 .\"
-.\" Permission to use, copy, modify, and distribute this software for any
+.\" Permission to use, copy, modify, and/or distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies.
 .\"

diff --git a/src/agent.c b/src/agent.c
index 47eeac85b291960dfdb4c54a2debb081c0450c7e..cb829dee923d0b33496e9c2ae694d2ff1b6148b0 100644 (file)
--- a/src/agent.c
+++ b/src/agent.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/agent_priv.c b/src/agent_priv.c
index a74bc760aebaaafeb75220ffb5603c073c43f297..ab6b065a1d0f88984c9c86cacfdbe1585f7a6ec1 100644 (file)
--- a/src/agent_priv.c
+++ b/src/agent_priv.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/cdp.c b/src/cdp.c
index d8717151366918181e44de0639e28fe6b3d2fec7..063315fb48d46608106bdbf97dfcca0145f73ad0 100644 (file)
--- a/src/cdp.c
+++ b/src/cdp.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/cdp.h b/src/cdp.h
index 8f2e087fbf9bd997697d3c40d008b30ab83b8b33..904506da00ec8f8a65cf5c1798e54a69dabefdd2 100644 (file)
--- a/src/cdp.h
+++ b/src/cdp.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/client.c b/src/client.c
index 8d87f0185148e10a2ec9f2ab89941acb69dd6491..7a9e7ab0a0851062d5ac36813f0fbc821fd775ce 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/ctl-server.c b/src/ctl-server.c
index 8f45df678bf2d5969b7de4cca259feb838d00fbd..090db2586c6c7ad8db4bb0abe6eea313a47e07a2 100644 (file)
--- a/src/ctl-server.c
+++ b/src/ctl-server.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/ctl.c b/src/ctl.c
index 60937206f98686b280bc0a9336a72391387110a4..3bf38030ebe2a53ca6578d5c2f0b9959476528cc 100644 (file)
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/display.c b/src/display.c
index cde5fa0250abab24341b92772a9d812db0aa2043..c417ec6fe8577854d31dd7223a6fa534cb34f119 100644 (file)
--- a/src/display.c
+++ b/src/display.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/dmi.c b/src/dmi.c
index ccef56deadb242b0b57154a731d1cf8c99245994..367ae0d0033278eee89b6dbf0d058cdde283531b 100644 (file)
--- a/src/dmi.c
+++ b/src/dmi.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2009 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/edp.c b/src/edp.c
index 810cab673efa8a35006ffb7cb67c0e7300b2fc75..ee210065c074b45452ea0b2c21a5c1e14e4efc63 100644 (file)
--- a/src/edp.c
+++ b/src/edp.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/edp.h b/src/edp.h
index 9a4f6c28a0cfefcc388105d008ead49a894e0286..ffa92ddfb6d82bc8f570a091c71fdf1cd9e02755 100644 (file)
--- a/src/edp.h
+++ b/src/edp.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/frame.c b/src/frame.c
index a0ee59a02b5d5bb6fe61b3985a1dff2496d73da6..d091e596ad03cbd0df8bd7e4c1dac5d164d3f161 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2009 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/frame.h b/src/frame.h
index 497f65022e9ec7911ce3692656c1f2bd61648a62..c7edb6b0b42da39f24cd425f79a8b8fe0e63b279 100644 (file)
--- a/src/frame.h
+++ b/src/frame.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2009 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/interfaces.c b/src/interfaces.c
index eded64daa9adfe45a7cfe0e4e9d795cad008c8e8..6dc319a025749744268e4d2bdff4edeec75ec588 100644 (file)
--- a/src/interfaces.c
+++ b/src/interfaces.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/kv_writer.c b/src/kv_writer.c
index ec0b4e5c6e21d9546c21dfb4a8d67000f65d317f..efc8ec7746d841153e67bf0cb46809103e614533 100644 (file)
--- a/src/kv_writer.c
+++ b/src/kv_writer.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2010 Andreas Hofmeister <andi@collax.com>
  *               2010 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/lldp.c b/src/lldp.c
index 28680f2851d4f286e56a5bd448f197b1229014a8..9d7cc4d14bb196dc21b74463fc4d214fd876e040 100644 (file)
--- a/src/lldp.c
+++ b/src/lldp.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/lldp.h b/src/lldp.h
index 06a15d67cf451fb558697bb834a7148674abebae..273cb7308f913933ad5d9c364e6dc6a032c7f80c 100644 (file)
--- a/src/lldp.h
+++ b/src/lldp.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/lldpctl.c b/src/lldpctl.c
index bab295dee9b986e26c09174e9100cbcc5a539580..0c2b378888b925b88143805299e2f2d7013d81be 100644 (file)
--- a/src/lldpctl.c
+++ b/src/lldpctl.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/lldpd.c b/src/lldpd.c
index b620b2031bdd6c90ad2846fa6a262552a7646ab0..b19af11252d174ca7b7c7a50a1618dfe5c13a534 100644 (file)
--- a/src/lldpd.c
+++ b/src/lldpd.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/lldpd.h b/src/lldpd.h
index f03bd14281ed9b1cb96f2b498847010a2aeccb98..9543d73e5db673b80bf7224a34c0f8d50c8d3596 100644 (file)
--- a/src/lldpd.h
+++ b/src/lldpd.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/log.c b/src/log.c
index 8e0c0de480ef7511bdf48aa111a70502c365c83e..2b110f437e541f5632b4e0bae43d261dc05b6e32 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -3,7 +3,7 @@
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/priv.c b/src/priv.c
index 1129e3756ca51a96672c45ebd28a45c828cf9e17..6e715e97bce196bac4130ca72d9da361e65cc384 100644 (file)
--- a/src/priv.c
+++ b/src/priv.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
@@ -573,7 +573,7 @@ priv_init(char *chrootdir)
  * Copyright (c) 2003 Can Erkin Acar
  * Copyright (c) 2003 Anil Madhavapeddy <anil@recoil.org>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/sonmp.c b/src/sonmp.c
index c2a9a3784941ad3239a3b161c05ac38366711b3a..a7a8f13e0c7c9069ad86918d1f18ca7a92e51750 100644 (file)
--- a/src/sonmp.c
+++ b/src/sonmp.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/sonmp.h b/src/sonmp.h
index f2051ac439b2f3cc05c8e996f2d3183cfc094919..68502dc776025008788f131ecca8e7e889c5cad4 100644 (file)
--- a/src/sonmp.h
+++ b/src/sonmp.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2008 Vincent Bernat <bernat@luffy.cx>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/strlcpy.c b/src/strlcpy.c
index d32b6590f1e77bde6c9f7c10824868d107d7606c..c30566a7dbf7b237d09f4bf335842a6b4aef2933 100644 (file)
--- a/src/strlcpy.c
+++ b/src/strlcpy.c
@@ -3,7 +3,7 @@
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/text_writer.c b/src/text_writer.c
index b83ec9c64032af6083c27fa4b2646df2b8cd306c..b76cdcb58a8d60a30096b833d0bd95e82a841357 100644 (file)
--- a/src/text_writer.c
+++ b/src/text_writer.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2010 Andreas Hofmeister <andi@collax.com>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/writer.h b/src/writer.h
index dadc201734f49370414200b389cf0e096ef3e37a..b2479c35b9321da529b4fd4f131f20d84f45be3d 100644 (file)
--- a/src/writer.h
+++ b/src/writer.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2010 Andreas Hofmeister <andi@collax.com>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/src/xml_writer.c b/src/xml_writer.c
index cfcef7e94788a13afebfb0b9df453bfe7455783e..de404fbaac4e86e962b1ae4fb1738b95c323aff4 100644 (file)
--- a/src/xml_writer.c
+++ b/src/xml_writer.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2010 Andreas Hofmeister <andi@collax.com>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *