From owner-svn-ports-head@FreeBSD.ORG  Fri Nov 15 19:10:30 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DE968998;
 Fri, 15 Nov 2013 19:10:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B4D5F2F26;
 Fri, 15 Nov 2013 19:10:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAFJAUeS041270;
 Fri, 15 Nov 2013 19:10:30 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAFJAUNs041268;
 Fri, 15 Nov 2013 19:10:30 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201311151910.rAFJAUNs041268@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Fri, 15 Nov 2013 19:10:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333912 - in head/net/xrdp-devel: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Nov 2013 19:10:30 -0000

Author: swills
Date: Fri Nov 15 19:10:29 2013
New Revision: 333912
URL: http://svnweb.freebsd.org/changeset/ports/333912

Log:
  - Fix autologin
  
  PR:		ports/183978
  Submitted by:	Koichiro IWAO <meta+ports@vmeta.jp> (maintainer)

Added:
  head/net/xrdp-devel/files/patch-fix-autologin   (contents, props changed)
Modified:
  head/net/xrdp-devel/Makefile

Modified: head/net/xrdp-devel/Makefile
==============================================================================
--- head/net/xrdp-devel/Makefile	Fri Nov 15 18:59:25 2013	(r333911)
+++ head/net/xrdp-devel/Makefile	Fri Nov 15 19:10:29 2013	(r333912)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xrdp
 PORTVERSION=	0.7.0.b20130912
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	GH

Added: head/net/xrdp-devel/files/patch-fix-autologin
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/xrdp-devel/files/patch-fix-autologin	Fri Nov 15 19:10:29 2013	(r333912)
@@ -0,0 +1,22 @@
+--- xrdp/xrdp_wm.c.orig	2013-11-13 10:47:47.291991020 +0000
++++ xrdp/xrdp_wm.c	2013-11-13 10:53:12.461993834 +0000
+@@ -509,12 +509,17 @@
+         {
+           /* if no doamin is passed, and no autorun in xrdp.ini,
+              use the first item in the xrdp.ini
+-             file thats not named 'globals' */
++             file thats not named 
++             'globals' or 'Logging' or channels */
++          /* TODO: change this and have a 'autologin'
++             line in globals section */
+           file_read_sections(fd, names);
+           for (index = 0; index < names->count; index++)
+           {
+             q = (char*)list_get_item(names, index);
+-            if (g_strncasecmp("globals", q, 8) != 0)
++            if ((g_strncasecmp("globals", q, 8) != 0) &&
++                (g_strncasecmp("Logging", q, 8) != 0) &&
++                (g_strncasecmp("channels", q, 9) != 0))
+             {
+               g_strncpy(section_name, q, 255);
+               break;