From owner-svn-ports-head@FreeBSD.ORG  Tue Jul 29 00:39:33 2014
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 D361D8C5;
 Tue, 29 Jul 2014 00:39:33 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C11F529F9;
 Tue, 29 Jul 2014 00:39:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6T0dXZq013023;
 Tue, 29 Jul 2014 00:39:33 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6T0dXTZ013022;
 Tue, 29 Jul 2014 00:39:33 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201407290039.s6T0dXTZ013022@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Tue, 29 Jul 2014 00:39:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r363280 - head/devel/bugzilla44/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.18
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: Tue, 29 Jul 2014 00:39:33 -0000

Author: peter (src committer)
Date: Tue Jul 29 00:39:33 2014
New Revision: 363280
URL: http://svnweb.freebsd.org/changeset/ports/363280
QAT: https://qat.redports.org/buildarchive/r363280/

Log:
  Update FreeBSD.org cluster-specific patch to match what is running on
  bugs.freebsd.org/bugzilla/.

Modified:
  head/devel/bugzilla44/files/freebsd-project-ldap.diff

Modified: head/devel/bugzilla44/files/freebsd-project-ldap.diff
==============================================================================
--- head/devel/bugzilla44/files/freebsd-project-ldap.diff	Tue Jul 29 00:16:32 2014	(r363279)
+++ head/devel/bugzilla44/files/freebsd-project-ldap.diff	Tue Jul 29 00:39:33 2014	(r363280)
@@ -9,3 +9,16 @@
      }
  
      $params->{realname}  ||= $user_entry->get_value("displayName");
+--- token.cgi.dist	2014-06-03 00:27:29.279355734 +0000
++++ token.cgi	2014-06-03 00:37:48.727359133 +0000
+@@ -122,6 +122,10 @@
+     my $login_name = $cgi->param('loginname')
+       or ThrowUserError("login_needed_for_password_change");
+ 
++    if ($login_name =~ /[@.]FreeBSD\.org$/i) {
++	ThrowUserError("password_change_requests_not_allowed");
++    }
++
+     check_email_syntax($login_name);
+     my $user = Bugzilla::User->check($login_name);
+