Changeset 1152

Timestamp:

03/09/08 16:23:12 (9 months ago)

Author:

ahu

Message:

Norbert has added support for far more record types to LDAP, plus Debian supplied improvements to 'PowerLDAP', plus improved autoconf detection of ldap

Files:

• trunk/pdns/modules/ldapbackend/Makefile.am (modified) (1 diff)
• trunk/pdns/modules/ldapbackend/OBJECTLIBS (modified) (1 diff)
• trunk/pdns/modules/ldapbackend/ldapbackend.cc (modified) (1 diff)
• trunk/pdns/modules/ldapbackend/ldapbackend.hh (modified) (2 diffs)
• trunk/pdns/modules/ldapbackend/powerldap.cc (modified) (7 diffs)

trunk/pdns/modules/ldapbackend/Makefile.am

@@ -1 +1 @@
-AM_CPPFLAGS=@THREADFLAGS@
-
-=
+ = 
-
-lib_LTLIBRARIES = libldapbackend.la
-
-
-
-
-
-
-
-
-
-
+
+
+

trunk/pdns/modules/ldapbackend/OBJECTLIBS

@@ -1 @@
-
+_r

trunk/pdns/modules/ldapbackend/ldapbackend.cc

@@ -132 +132 @@
-
-        // search for SOARecord of target
-associatedDomain=" + qesc
+&(associatedDomain=" + qesc + ")(sOARecord=*)"
-        m_msgid = m_pldap->search( dn, LDAP_SCOPE_SUBTREE, filter, (const char**) ldap_attrany );
-        m_pldap->getSearchEntry( m_msgid, m_result, true );

trunk/pdns/modules/ldapbackend/ldapbackend.hh

@@ -50 +50 @@
-
-
+/*
+ *  Known DNS RR types
+ *  Types which aren't active are currently not supported by PDNS
+ */
+
-static const char* ldap_attrany[] = {
-        "associatedDomain",
@@ -62 +67 @@
-        "tXTRecord",
-        "rPRecord",
+        "aFSDBRecord",
-//      "SigRecord",
-
+
+
-        "aAAARecord",
-        "lOCRecord",
-//      "nXTRecord",
-        "sRVRecord",
-        "nAPTRRecord",
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        "modifyTimestamp",
-        NULL

trunk/pdns/modules/ldapbackend/powerldap.cc

@@ -1 +1 @@
-#include "powerldap.hh"
-
+
-#include <sys/time.h>
-
-
+
-PowerLDAP::PowerLDAP( const string& hosts, uint16_t port, bool tls )
-{
+        int err;
+
+#ifdef HAVE_LDAP_INITIALIZE
+        if( ( err = ldap_initialize( &d_ld, hosts.c_str() ) ) != LDAP_SUCCESS )
+        {
+                string ldapuris;
+                vector<string> uris;
+                stringtok( uris, hosts );
+
+                for( size_t i = 0; i < uris.size(); i++ )
+                {
+                        ldapuris += " ldap://" + uris[i];
+                }
+
+                if( ( err = ldap_initialize( &d_ld, ldapuris.c_str() ) ) != LDAP_SUCCESS )
+                {
+                                throw LDAPException( "Error initializing LDAP connection to '" + ldapuris + ": " + getError( err ) );
+                }
+        }
+#else
+        if( ( d_ld = ldap_init( hosts.c_str(), port ) ) == NULL )
+        {
+                throw LDAPException( "Error initializing LDAP connection to '" + hosts + "': " + string( strerror( errno ) ) );
+        }
+#endif
+
-        int protocol = LDAP_VERSION3;
-
-
-        if( ldap_initialize( &d_ld, hosts.c_str() ) != LDAP_SUCCESS )
-        {
-                if( ( d_ld = ldap_init( hosts.c_str(), port ) ) == NULL )
-                {
-                        throw LDAPException( "Error initializing LDAP connection: " + string( strerror( errno ) ) );
-                }
-
-                if( tls && ldap_start_tls_s( d_ld, NULL, NULL ) != LDAP_SUCCESS )
-                {
-                        ldap_unbind( d_ld );
-                        throw( LDAPException( "Couldn't perform STARTTLS" ) );
-                }
-        }
-
-        if( ldap_set_option( d_ld, LDAP_OPT_PROTOCOL_VERSION, &protocol ) != LDAP_OPT_SUCCESS )
-        {
@@ -28 +39 @@
-                if( ldap_set_option( d_ld, LDAP_OPT_PROTOCOL_VERSION, &protocol ) != LDAP_OPT_SUCCESS )
-                {
-( d_ld
+_ext( d_ld, NULL, NULL
-                        throw LDAPException( "Couldn't set protocol version to LDAPv3 or LDAPv2" );
-                }
-        }
+
+        if( tls && ( err = ldap_start_tls_s( d_ld, NULL, NULL ) ) != LDAP_SUCCESS )
+        {
+                ldap_unbind_ext( d_ld, NULL, NULL );
+                throw LDAPException( "Couldn't perform STARTTLS: " + getError( err ) );
+        }
-}
-
@@ -37 +54 @@
-PowerLDAP::~PowerLDAP()
-{
-( d_ld
+_ext( d_ld, NULL, NULL
-}
-
@@ -63 +80 @@
-        int msgid;
-
+#ifdef HAVE_LDAP_SASL_BIND
+        int rc;
+        struct berval passwd;
+
+        passwd.bv_val = (char *)ldapsecret.c_str();
+        passwd.bv_len = strlen( passwd.bv_val );
+
+        if( ( rc = ldap_sasl_bind( d_ld, ldapbinddn.c_str(), LDAP_SASL_SIMPLE, &passwd, NULL, NULL, &msgid ) ) != LDAP_SUCCESS )
+        {
+                throw LDAPException( "Failed to bind to LDAP server: " + getError( rc ) );
+        }
+#else
-        if( ( msgid = ldap_bind( d_ld, ldapbinddn.c_str(), ldapsecret.c_str(), method ) ) == -1 )
-        {
-                throw LDAPException( "Failed to bind to LDAP server: " + getError( msgid ) );
-        }
+#endif
-
-        waitResult( msgid, timeout, NULL );
@@ -72 +102 @@
-
-
+/**
+ * Depricated, use PowerLDAP::bind() instead
+ */
+
-void PowerLDAP::simpleBind( const string& ldapbinddn, const string& ldapsecret )
-{
-
-
-
-
-
+
-}
-
@@ -84 +114 @@
-int PowerLDAP::search( const string& base, int scope, const string& filter, const char** attr )
-{
-
-
-
-
+
+
+
+
+
-        }
-
@@ -210 +241 @@
-const string PowerLDAP::getError( int rc )
-{
-
-
-
-
-
-
-
-
+
+
+
-}
-