[X2go-Commits] x2godesktopsharing.git - master (branch) updated: 3.0.1.2-7-g91e0971

[X2go dev team]

The branch, master has been updated
       via  91e0971284d686e42f444e312cf3220ea22ea6f9 (commit)
       via  4cf4a0b2dad35e92ddaac712c9d2b6f513cd4a46 (commit)
      from  ecfddd98ebfd7f844942ebba155240ba7a388e22 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 91e0971284d686e42f444e312cf3220ea22ea6f9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Aug 16 23:18:51 2011 +0200

    Make sure postinst script does not fail when checking for existence of group x2godesktopsharing.

commit 4cf4a0b2dad35e92ddaac712c9d2b6f513cd4a46
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Aug 2 15:18:54 2011 +0200

    System group for x2godesktopsharing change from x2gousers ->  x2godesktopsharing.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                   |    4 ++++
 debian/x2godesktopsharing.postinst |    4 ++--
 sharetray.cpp                      |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b8c5bf1..b0d3854 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 x2godesktopsharing (3.0.1.3-0~x2go1) UNRELEASED; urgency=low
 
   * Fix incomplete DENY statement in main.cpp.
+  * System group for x2godesktopsharing change from x2gousers -> 
+    x2godesktopsharing.
+  * Make sure postinst script does not fail when checking for existence
+    of group x2godesktopsharing.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 13 Jun 2011 20:39:33 +0200
 
diff --git a/debian/x2godesktopsharing.postinst b/debian/x2godesktopsharing.postinst
index 2f7b721..6fd8a1a 100755
--- a/debian/x2godesktopsharing.postinst
+++ b/debian/x2godesktopsharing.postinst
@@ -22,10 +22,10 @@ set -e
 
 case "$1" in
     configure)
-    X2GOGRP=`getent group | grep x2gousers`
+    X2GOGRP=`getent group | grep x2godesktopsharing || true`
     if [ "x$X2GOGRP"="x" ]
     then 
-         addgroup --system x2gousers
+         addgroup --system x2godesktopsharing
     fi
     ;;
 
diff --git a/sharetray.cpp b/sharetray.cpp
index 7fe23f0..9f42997 100644
--- a/sharetray.cpp
+++ b/sharetray.cpp
@@ -215,7 +215,7 @@ void ShareTray::slotStartSharing()
     if ( serverSocket->listen ( socketFname ) )
     {
 
-        chown ( socketFname.toAscii(),getuid(),getgrnam ( "x2gousers" )->gr_gid );
+        chown ( socketFname.toAscii(),getuid(),getgrnam ( "x2godesktopsharing" )->gr_gid );
         QFile::setPermissions ( socketFname,
                                 QFile::ReadOwner|QFile::WriteOwner|QFile::ReadGroup|QFile::WriteGroup );
         connect ( serverSocket,SIGNAL ( newConnection() ),


hooks/post-receive
-- 
x2godesktopsharing.git (Desktop Sharing for X2go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2godesktopsharing.git" (Desktop Sharing for X2go).