From owner-svn-ports-all@freebsd.org  Fri Aug 26 16:19:06 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1F596B7469A;
 Fri, 26 Aug 2016 16:19:06 +0000 (UTC) (envelope-from pi@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D702ED30;
 Fri, 26 Aug 2016 16:19:05 +0000 (UTC) (envelope-from pi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7QGJ5Fc087130;
 Fri, 26 Aug 2016 16:19:05 GMT (envelope-from pi@FreeBSD.org)
Received: (from pi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7QGJ4c0087128;
 Fri, 26 Aug 2016 16:19:04 GMT (envelope-from pi@FreeBSD.org)
Message-Id: <201608261619.u7QGJ4c0087128@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org
 using -f
From: Kurt Jaeger <pi@FreeBSD.org>
Date: Fri, 26 Aug 2016 16:19:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r420929 - in head/x11/xdm: . 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-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Aug 2016 16:19:06 -0000

Author: pi
Date: Fri Aug 26 16:19:04 2016
New Revision: 420929
URL: https://svnweb.freebsd.org/changeset/ports/420929

Log:
  x11/xdm: remove part of files/patch-greeter-greet.c that no longer applies
  
  PR:		211624
  Reported by:	ak

Modified:
  head/x11/xdm/Makefile
  head/x11/xdm/files/patch-greeter-greet.c

Modified: head/x11/xdm/Makefile
==============================================================================
--- head/x11/xdm/Makefile	Fri Aug 26 15:49:51 2016	(r420928)
+++ head/x11/xdm/Makefile	Fri Aug 26 16:19:04 2016	(r420929)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xdm
 PORTVERSION=	1.1.11
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11/xdm/files/patch-greeter-greet.c
==============================================================================
--- head/x11/xdm/files/patch-greeter-greet.c	Fri Aug 26 15:49:51 2016	(r420928)
+++ head/x11/xdm/files/patch-greeter-greet.c	Fri Aug 26 16:19:04 2016	(r420929)
@@ -8,12 +8,3 @@
      Debug ("Greet loop finished\n");
      /*
       * Run system-wide initialization file
-@@ -729,6 +730,8 @@ static int pamconv(int num_msg,
- 	goto pam_error;
-     }
- 
-+    if (login == NULL) goto pam_error;
-+
-     for (i = 0; i < num_msg; i++ , m++ , r++) {
- 	char *username;
- 	int promptId = 0;