[daemon-fix] fixed getting uid and pid when transport is not kdbus

[platform/upstream/dbus.git] / COPYING

diff --git a/COPYING b/COPYING
index 90085d3..8260b10 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,11 +1,12 @@
-D-BUS is licensed to you under your choice of the Academic Free
-License version 2.1, or the GNU General Public License version 2.
+D-Bus is licensed to you under your choice of the Academic Free
+License version 2.1, or the GNU General Public License version 2
+(or, at your option any later version).
+

 Both licenses are included here. Some of the standalone binaries are
 under the GPL only; in particular, but not limited to,
 tools/dbus-cleanup-sockets.c and test/decode-gcov.c. Each source code
 Both licenses are included here. Some of the standalone binaries are
 under the GPL only; in particular, but not limited to,
 tools/dbus-cleanup-sockets.c and test/decode-gcov.c. Each source code

-file is marked with the proper copyright information.
-
-
+file is marked with the proper copyright information - if you find a
+file that isn't marked please bring it to our attention.

 
 The Academic Free License
 v. 2.1
 
 The Academic Free License
 v. 2.1


@@ -212,7 +213,7 @@ START OF GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.

- 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

 
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.


@@ -516,7 +517,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
 
     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
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

 
 
 Also add information on how to contact you by electronic and paper mail.
 
 
 Also add information on how to contact you by electronic and paper mail.