ports/115867: proftpd ldap support does not work

[Thomas Vogt]

>Number:         115867
>Category:       ports
>Synopsis:       proftpd ldap support does not work
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 27 14:00:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Thomas Vogt
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD bert.mlan.solnet.ch 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Thu Aug 16 10:45:59 UTC 2007 root at bert.mlan.solnet.ch:/usr/obj/usr/src/sys/BERT i386


	
>Description:

mod_ldap.c in proftpd is broken. John Morrissey maintainer of mod_ldap.c is aware of this issue. He send me an bugfix.

>How-To-Repeat:
mod_ldap uses the wrong argument.
mod_ldap/2.8.17-20070701: unexpected LDAPServer type. 
mod_ldap.c: error initializing session: No such file or directory 

>Fix:
--- Makefile.orig	2007-08-27 15:28:31.000000000 +0200
+++ Makefile	2007-08-27 15:28:41.000000000 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	proftpd
 DISTVERSION=	1.3.1rc3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \



--- contrib/mod_ldap.c.orig	2007-08-27 15:30:18.000000000 +0200
+++ contrib/mod_ldap.c	2007-08-27 15:30:23.000000000 +0200
@@ -22,7 +22,7 @@
  */
 
 /*
- * mod_ldap v2.8.17-20070701
+ * mod_ldap v2.8.17
  *
  * Thanks for patches go to (in alphabetical order):
  *
@@ -48,7 +48,7 @@
  *                                                   LDAPDefaultAuthScheme
  *
  *
- * $Id: mod_ldap.c,v 1.54 2007/07/02 23:20:31 jwm Exp $
+ * $Id: mod_ldap.c,v 1.57 2007/08/22 02:00:06 jwm Exp $
  * $Libraries: -lldap -llber$
  */
 
@@ -70,7 +70,7 @@
 #include "conf.h"
 #include "privs.h"
 
-#define MOD_LDAP_VERSION	"mod_ldap/2.8.17-20070701"
+#define MOD_LDAP_VERSION	"mod_ldap/2.8.17"
 
 #if PROFTPD_VERSION_NUMBER < 0x0001021002
 # error MOD_LDAP_VERSION " requires ProFTPD 1.2.10rc2 or later"
@@ -2245,8 +2245,8 @@
    * ldap_init() will connect to the LDAP SDK's default.
    */
   if ((c = find_config(main_server->conf, CONF_PARAM, "LDAPServer", FALSE)) != NULL) {
-    if (strcmp(c->argv[1], "url") == 0) {
-      url = c->argv[2];
+    if (strcmp(c->argv[0], "url") == 0) {
+      url = c->argv[1];
       if (url) {
 #ifdef LDAP_OPT_X_TLS_HARD
         if (strcmp(url->lud_scheme, "ldaps") == 0) {
@@ -2269,8 +2269,8 @@
          * by other/future callers.
          */
       }
-    } else if (strcmp(c->argv[1], "host") == 0) {
-      ldap_server = c->argv[2];
+    } else if (strcmp(c->argv[0], "host") == 0) {
+      ldap_server = c->argv[1];
     } else {
       /* This should never happen, since the configuration handler for
        * LDAPServer only passes url or host, but we'll be defensive.
>Release-Note:
>Audit-Trail:
>Unformatted: