[Vpn-devel] various bugs and fixes

[Matthew Grooms]

mgrooms wrote:
> On Tue, 9 Oct 2007 23:52:41 +0800, "Nicolas Deschildre"
> 
> I have tested LDAP support on both Ubuntu 6.x and 7.x but will look at it
> again just to be sure.
> 

Looks like the version of openldap you are using doesn't define 
LDAP_SCOPE_ONE but rather LDAP_SCOPE_ONELEVEL. I have committed the 
patch you submitted and a fix for the ldap problem to both the head and 
2.0.1 branch.

If you like, you can pull these changes from the public subversion 
repository at ...

svn://svn.shrew.net/ike/release-2.0.1

... or apply the following patch ...

Index: ike.xauth.cpp
===================================================================
--- ike.xauth.cpp	(revision 227)
+++ ike.xauth.cpp	(revision 228)
@@ -236,7 +236,7 @@
  	BDATA	filter;
  	char *	atlist[ 1 ] = { NULL };
  	char *	userdn = NULL;
-	int		scope = LDAP_SCOPE_ONE;
+	int		scope = LDAP_SCOPE_ONELEVEL;
  	int	ecount = 0;

  	LDAPMessage * lr = NULL;
@@ -370,7 +370,7 @@
  	LDAP *	ld = NULL;
  	BDATA	filter;
  	char *	atlist[ 1 ] = { NULL };
-	int		scope = LDAP_SCOPE_ONE;
+	int		scope = LDAP_SCOPE_ONELEVEL;
  	int	ecount = 0;

  	LDAPMessage * lr = NULL;

Thanks,

-Matthew