From dkirhlarov@localhost.oilspace.com  Fri Apr 21 11:30:59 2006
Return-Path: <dkirhlarov@localhost.oilspace.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F297116A428
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Apr 2006 11:30:58 +0000 (UTC)
	(envelope-from dkirhlarov@localhost.oilspace.com)
Received: from office.oilspace.com (ns2.oilspace.com [194.129.65.230])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5CB2E43D48
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Apr 2006 11:30:58 +0000 (GMT)
	(envelope-from dkirhlarov@localhost.oilspace.com)
Received: from dimma.mow.oilspace.com (infra-gw.oilspace.com [81.222.156.2])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by office.oilspace.com (Postfix) with ESMTP id B1598136CDE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Apr 2006 12:30:56 +0100 (BST)
Received: from dimma.mow.oilspace.com (localhost [127.0.0.1])
	by dimma.mow.oilspace.com (8.13.4/8.13.3) with ESMTP id k3LBUuYC002906
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Apr 2006 15:30:56 +0400 (MSD)
	(envelope-from dkirhlarov@localhost.oilspace.com)
Received: (from dkirhlarov@localhost)
	by dimma.mow.oilspace.com (8.13.4/8.13.3/Submit) id k3LBUtX8002905;
	Fri, 21 Apr 2006 15:30:55 +0400 (MSD)
	(envelope-from dkirhlarov)
Message-Id: <200604211130.k3LBUtX8002905@dimma.mow.oilspace.com>
Date: Fri, 21 Apr 2006 15:30:55 +0400 (MSD)
From: Dmitriy Kirhlarov <dkirhlarov@oilspace.com>
Reply-To: Dmitriy Kirhlarov <dkirhlarov@oilspace.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] proftpd mod_ldap+mod_ssl
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         96134
>Category:       ports
>Synopsis:       [PATCH] proftpd mod_ldap+mod_ssl
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 21 11:40:10 GMT 2006
>Closed-Date:    Mon May 01 11:05:46 GMT 2006
>Last-Modified:  Mon May 01 11:05:46 GMT 2006
>Originator:     Dmitriy Kirhlarov
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD dimma.mow.oilspace.com 5.4-STABLE FreeBSD 5.4-STABLE #0: Sun Sep 25 23:26:13 MSD 2005 root@dimma.mow.oilspace.com:/usr/obj/usr/src/sys/dimma i386

>Description:
	proftpd compiled from port without TLS support for ldap
	connection. proftpd don't start with recommendation uncomment
	one line in mod_ldap.c and rebuild himself.
>How-To-Repeat:
	Just install proftpd from ports with OPENSSL and LDAP and try
	use
	LDAPUseTLS	on

>Fix:
diff -urNB proftpd.orig/Makefile proftpd/Makefile
--- proftpd.orig/Makefile	Fri Apr 21 10:34:47 2006
+++ proftpd/Makefile	Fri Apr 21 11:13:22 2006
@@ -126,6 +126,9 @@
 .include <${PORTSDIR}/Mk/bsd.openssl.mk>
 PROFTPD_LIBS+=	-lssl -lcrypto -L${LOCALBASE}/lib
 MODULES:=${MODULES}:mod_tls
+.if defined(WITH_LDAP)
+EXTRA_PATCHES=${FILESDIR}/extra-patch-module-mod_ldap.c
+.endif
 .endif
 
 .if defined(WITH_CTRLS)
diff -urNB proftpd.orig/files/extra-patch-module-mod_ldap.c proftpd/files/extra-patch-module-mod_ldap.c
--- proftpd.orig/files/extra-patch-module-mod_ldap.c	Thu Jan  1 00:00:00 1970
+++ proftpd/files/extra-patch-module-mod_ldap.c	Fri Apr 21 10:36:08 2006
@@ -0,0 +1,11 @@
+--- contrib/mod_ldap.c	Fri Apr 21 10:31:23 2006
++++ contrib/mod_ldap.c	Fri Apr 21 10:31:43 2006
+@@ -55,7 +55,7 @@
+  * after connecting to the LDAP server. If TLS cannot be enabled, the LDAP
+  * connection will fail.
+  */
+-/* #define USE_LDAP_TLS */
++#define USE_LDAP_TLS
+ 
+ /* Uncomment this if you have OpenSSL and wish to verify non-crypt()
+  * password hashes locally with OpenSSL. You'll also need to edit


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mharo 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Apr 21 12:00:32 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96134 
Responsible-Changed-From-To: mharo->freebsd-ports-bugs 
Responsible-Changed-By: erwin 
Responsible-Changed-When: Mon May 1 07:58:49 UTC 2006 
Responsible-Changed-Why:  
Reset maintainership. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95586 
Responsible-Changed-From-To: mharo->freebsd-ports-bugs 
Responsible-Changed-By: erwin 
Responsible-Changed-When: Mon May 1 07:58:49 UTC 2006 
Responsible-Changed-Why:  
Reset maintainership. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96134 
State-Changed-From-To: open->closed 
State-Changed-By: erwin 
State-Changed-When: Mon May 1 11:05:38 UTC 2006 
State-Changed-Why:  
Superseded by ports/96578 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96134 
>Unformatted:
