cups-x2go.git - master (branch) updated: 3.0.0.2-11-g66ceeab - x2go-commits

25 Aug 2011

The branch, master has been updated
       via  66ceeab13cba84ed0e23e09310465d9bb3c184fc (commit)
      from  0b36c971b50eafced979f4656caeb214292b681c (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 66ceeab13cba84ed0e23e09310465d9bb3c184fc
Author: Oleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de>
Date:   Thu Aug 25 13:46:51 2011 +0200

    * fixed reading deprecated /etc/x2go/sql
    * fixed saving temprary file in / instead of /tmp

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

Summary of changes:
 cups-x2go        |   12 +++---------
 debian/changelog |    5 +++++
 2 files changed, 8 insertions(+), 9 deletions(-)

The diff of changes is:

diff --git a/cups-x2go b/cups-x2go
index 771eecd..853599f 100755
--- a/cups-x2go
+++ b/cups-x2go
@@ -69,13 +69,7 @@ sub getsessions
   my $sesslist;
   if ( $x2goserver eq "local" )
   {
-       open (SQLCONF, "</etc/x2go/sql");
-       my $cfgline=<SQLCONF>;
-       close (SQLCONF);
-       if(($cfgline=~m/local/)||($cfgline=~m/sqlite/))
-       {
-            $sesslist=`su $userName -c "x2golistsessions --all-servers"`;
-       }
+        $sesslist=`su $userName -c "x2golistsessions --all-servers"`;
   }
   else
   {
@@ -92,7 +86,7 @@ sub printfile
     if($phost eq $host)
     {
        my ($tm,$tm,$uid,$gid,$tm,$tm,$tm,$spooldir)=getpwnam("x2goprint");
-       my $spfile="$spooldir$sess$bname";
+       my $spfile="$spooldir/$sess$bname";
        copy($pfile, $spfile);
        copy($tfile, "$spfile.title");
        chown $uid,$gid,$spfile;
@@ -135,7 +129,7 @@ if (!$printFile)
     my $uid = $userName;
     $jid =~ s/\W//g; #sanity check
     $uid =~ s/\W//g; #sanity check
-    $tempFile = "$ENV{TMPDIR}/$jid-$uid-cupsjob$$";
+    $tempFile = "/tmp/$jid-$uid-cupsjob$$";
     open (OUT, ">$tempFile") or die "ERROR: Cannot write $tempFile: $!\n";
     while(<STDIN>)
     {
diff --git a/debian/changelog b/debian/changelog
index 6bfa28b..6f8e439 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 cups-x2go (3.0.0.2-0~x2go2) UNRELEASED; urgency=low
 
+  [ Mike Gabriel ]
   * Add dpkg-statoverride for CUPS backend cups-x2go, file permission 0700
     on CUPS backend makes CUPS run this backend with root-privileges which
     is needed for cups-x2go to work.
 
+  [ Oleksandr Shneyder ]
+  * fixed reading deprecated /etc/x2go/sql
+  * fixed saving temprary file in / instead of /tmp
+
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Thu, 07 Jul 2011 00:05:46 +0200
 
 cups-x2go (3.0.0.2-0~x2go1) unstable; urgency=low


hooks/post-receive
-- 
cups-x2go.git (CUPS Backend for X2go Printing)

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 "cups-x2go.git" (CUPS Backend for X2go Printing).

    