From thomas@bert.mlan.solnet.ch  Mon Aug 27 13:53:54 2007
Return-Path: <thomas@bert.mlan.solnet.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0234116A419;
	Mon, 27 Aug 2007 13:53:54 +0000 (UTC)
	(envelope-from thomas@bert.mlan.solnet.ch)
Received: from bert.mlan.solnet.ch (bert.mlan.solnet.ch [212.101.1.83])
	by mx1.freebsd.org (Postfix) with ESMTP id 7567E13C45A;
	Mon, 27 Aug 2007 13:53:53 +0000 (UTC)
	(envelope-from thomas@bert.mlan.solnet.ch)
Received: from bert.mlan.solnet.ch (localhost.mlan.solnet.ch [127.0.0.1])
	by bert.mlan.solnet.ch (8.14.1/8.14.1) with ESMTP id l7RDhaKE062625;
	Mon, 27 Aug 2007 15:43:36 +0200 (CEST)
	(envelope-from thomas@bert.mlan.solnet.ch)
Received: (from thomas@localhost)
	by bert.mlan.solnet.ch (8.14.1/8.14.1/Submit) id l7RDhavf062624;
	Mon, 27 Aug 2007 15:43:36 +0200 (CEST)
	(envelope-from thomas)
Message-Id: <200708271343.l7RDhavf062624@bert.mlan.solnet.ch>
Date: Mon, 27 Aug 2007 15:43:36 +0200 (CEST)
From: Thomas Vogt <thomas@bsdunix.ch>
Reply-To: Thomas Vogt <thomas@bsdunix.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Beech Rintoul <beech@freebsd.org>
Subject: proftpd ldap support does not work
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         115867
>Category:       ports
>Synopsis:       ftp/proftpd ldap support does not work
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 27 14:00:01 GMT 2007
>Closed-Date:    Thu Aug 30 18:34:38 GMT 2007
>Last-Modified:  Thu Aug 30 18:40:06 GMT 2007
>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@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:

From: Beech Rintoul <beech@freebsd.org>
To: bug-followup@FreeBSD.org,
 Thomas Vogt <thomas@bsdunix.ch>
Cc:  
Subject: ports/115867: proftpd ldap support does not work
Date: Mon, 27 Aug 2007 10:53:45 -0800

 Thank you for your submission.
 Two problems. One, the patch does not apply cleanly. Two, the patch 
 breaks the module build on 7.x. I will consult with the developer on 
 this. 
 -- 
 ---------------------------------------------------------------------------------------
 Beech Rintoul - FreeBSD Developer - beech@FreeBSD.org
 /"\   ASCII Ribbon Campaign  | FreeBSD Since 4.x
 \ / - NO HTML/RTF in e-mail   | http://www.freebsd.org
  X  - NO Word docs in e-mail | Latest Release:
 / \  - http://www.FreeBSD.org/releases/6.2R/announce.html
 ---------------------------------------------------------------------------------------
 
 
 
State-Changed-From-To: open->feedback 
State-Changed-By: beech 
State-Changed-When: Mon Aug 27 19:37:42 UTC 2007 
State-Changed-Why:  
Need input from developer 


Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: beech 
Responsible-Changed-When: Mon Aug 27 19:37:42 UTC 2007 
Responsible-Changed-Why:  
My port 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115867 

From: Beech Rintoul <beech@freebsd.org>
To: bug-followup@freebsd.org,
 Thomas Vogt <thomas@bsdunix.ch>
Cc:  
Subject: ports/115867: proftpd ldap support does not work
Date: Mon, 27 Aug 2007 14:13:32 -0800

 Received vendor patch.
 Will be included with the forthcoming commit.
 -- 
 ---------------------------------------------------------------------------------------
 Beech Rintoul - FreeBSD Developer - beech@FreeBSD.org
 /"\   ASCII Ribbon Campaign  | FreeBSD Since 4.x
 \ / - NO HTML/RTF in e-mail   | http://www.freebsd.org
  X  - NO Word docs in e-mail | Latest Release:
 / \  - http://www.FreeBSD.org/releases/6.2R/announce.html
 ---------------------------------------------------------------------------------------
 
 
 
State-Changed-From-To: feedback->closed 
State-Changed-By: beech 
State-Changed-When: Thu Aug 30 18:34:23 UTC 2007 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115867 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/115867: commit references a PR
Date: Thu, 30 Aug 2007 18:33:37 +0000 (UTC)

 beech       2007-08-30 18:33:30 UTC
 
   FreeBSD ports repository
 
   Modified files:
     ftp/proftpd          Makefile distinfo 
   Added files:
     ftp/proftpd/files    extra-patch-contrib-mod_ldap.c 
   Removed files:
     ftp/proftpd/files    extra_patch-ldap-tls-mod_ldap.c 
   Log:
   - Add support for clamav
   - Fix ldap support
   
   PR:             ports/115752, ports/115867
   Submitted by:   Vladimir Korkodinov <viper@perm.raid.ru> (ports/115752),
                   Thomas Vogt <thomas@bsdunix.ch> (ports/115867)
   Approved by:    sat (mantor)
   
   Revision  Changes    Path
   1.116     +31 -11    ports/ftp/proftpd/Makefile
   1.39      +3 -0      ports/ftp/proftpd/distinfo
   1.1       +51 -0     ports/ftp/proftpd/files/extra-patch-contrib-mod_ldap.c (new)
   1.3       +0 -11     ports/ftp/proftpd/files/extra_patch-ldap-tls-mod_ldap.c (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
