Date: Fri, 21 Apr 2006 15:30:55 +0400 (MSD) From: Dmitriy Kirhlarov <dkirhlarov@oilspace.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/96134: [PATCH] proftpd mod_ldap+mod_ssl Message-ID: <200604211130.k3LBUtX8002905@dimma.mow.oilspace.com> Resent-Message-ID: <200604211140.k3LBeBcF053144@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96134
>Category: ports
>Synopsis: [PATCH] proftpd mod_ldap+mod_ssl
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 21 11:40:10 GMT 2006
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604211130.k3LBUtX8002905>