Bug#710007: xrdp: Drop 01reuse-session.patch, it is already included in upstream

2013-05-27 Thread Sergio Talens-Oliag
Package: xrdp
Version: 0.6.0-1
Severity: normal
Tags: upstream

Dear maintainer,

The debian/patches/01reuse-session.patch is already included in the upstream
source and applying it re-introduces the bug it is supposed to fix.

If you look at the patched code:

struct session_item* DEFAULT_CC
session_get_bydata(char* name, int width, int height, int bpp, int type)
{
  struct session_chain* tmp;

  +  /* convert from SCP_SESSION_TYPE namespace to SESMAN_SESSION_TYPE 
namespace */
  +  switch (type)
  +  {
  +case SCP_SESSION_TYPE_XVNC:
  +  type = SESMAN_SESSION_TYPE_XVNC;
  +  break;
  +case SCP_SESSION_TYPE_XRDP:
  +  type = SESMAN_SESSION_TYPE_XRDP;
  +  break;
  +default:
  +  return 0;
  +  }
  +
  /*THREAD-FIX require chain lock */
  lock_chain_acquire();

  tmp = g_sessions;

  /* convert from SCP_SESSION_TYPE namespace to SESMAN_SESSION_TYPE 
namespace */
  switch (type)
  {
case SCP_SESSION_TYPE_XVNC: /* 0 */
  type = SESMAN_SESSION_TYPE_XVNC; /* 2 */
  break;
case SCP_SESSION_TYPE_XRDP: /* 1 */
  type = SESMAN_SESSION_TYPE_XRDP; /* 1 */
  break;
default:
  lock_chain_release();
  return 0;
  }

  [...]

You will see that the patch changes the session type and the upstream code that
does the same thing sees the fixed session type and exits with the return 0
instead of executing the code to look for existing sessions.

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=ca_ES.UTF-8, LC_CTYPE=ca_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages xrdp depends on:
ii  adduser  3.113+nmu3
ii  libc62.17-3
ii  libpam0g 1.1.3-9
ii  libssl1.0.0  1.0.1e-3
ii  libx11-6 2:1.5.0-1+deb7u1
ii  libxfixes3   1:5.0-4+deb7u1

Versions of packages xrdp recommends:
ii  vnc4server [vnc-server]  4.1.1+X4.3.0-37.1

xrdp suggests no packages.

-- Configuration Files:
/etc/xrdp/sesman.ini
/etc/xrdp/xrdp.ini

-- no debconf information


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#710007: xrdp: Drop 01reuse-session.patch, it is already included in upstream

2013-05-27 Thread Vincent Bernat
 ❦ 27 mai 2013 15:11 CEST, Sergio Talens-Oliag s...@debian.org :

 The debian/patches/01reuse-session.patch is already included in the upstream
 source and applying it re-introduces the bug it is supposed to fix.

Hi Sergio!

Thanks for catching this one. It will be fixed on the next upload.
-- 
Instrument your programs.  Measure before making efficiency changes.
- The Elements of Programming Style (Kernighan  Plauger)


pgpqAJS69beQX.pgp
Description: PGP signature