svn commit: r555799 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm Conf/LDAP.pm

[jm...@apache.org]

Author: jm
Date: Thu Jul 12 15:26:53 2007
New Revision: 555799

URL: http://svn.apache.org/viewvc?view=rev&rev=555799
Log:
bug 5107: change default user_scores_ldap_username to be the null string, allowing anonymous binding; fix 'schema' syntax error in LDAP config support

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?view=diff&rev=555799&r1=555798&r2=555799
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Thu Jul 12 15:26:53 2007
@@ -2741,7 +2741,8 @@
 
 =item user_scores_ldap_username
 
-This is the Bind DN used to connect to the LDAP server.
+This is the Bind DN used to connect to the LDAP server.  It defaults
+to the empty string (""), allowing anonymous binding to work.
 
 Example: C<cn=master,dc=koehntopp,dc=de>
 
@@ -2750,13 +2751,14 @@
   push (@cmds, {
     setting => 'user_scores_ldap_username',
     is_admin => 1,
-    default => 'username',
+    default => '',
     type => $CONF_TYPE_STRING
   });
 
 =item user_scores_ldap_password
 
-This is the password used to connect to the LDAP server.
+This is the password used to connect to the LDAP server.  It defaults
+to the empty string ("").
 
 =cut
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm?view=diff&rev=555799&r1=555798&r2=555799
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm Thu Jul 12 15:26:53 2007
@@ -130,7 +130,7 @@
   my @attr   = $uri->attributes;
   my $scope  = $uri->scope;
   my $filter = $uri->filter;
-  my $schema = $uri->schema;
+  my $scheme = $uri->scheme;
   my %extn   = $uri->extensions; # unused
 
   $filter =~ s/__USERNAME__/$username/g;
@@ -157,7 +157,7 @@
 
   my $ldap = Net::LDAP->new ("$host:$port",
                 onerror => "warn",
-                schema => $schema);
+                scheme => $scheme);
 
   if (!defined($ldapuser) && !defined($ldappass)) {
     $ldap->bind;