Add wrapper for ldap_connect

mistotebe · mistotebe · commit 1a21801dae4a · 2023-08-22T08:38:49.000+01:00
diff --git a/Lib/ldap/ldapobject.py b/Lib/ldap/ldapobject.py
@@ -171,6 +171,15 @@ def fileno(self):
     """
     return self.get_option(ldap.OPT_DESC)
 
+  def connect(self):
+    """
+    connect() -> None
+        Establishes LDAP connection if needed.
+    """
+    if _ldap.VENDOR_VERSION >= 20500:
+        return self._ldap_call(self._l.connect)
+    raise NotImplementedError
+
   def abandon_ext(self,msgid,serverctrls=None,clientctrls=None):
     """
     abandon_ext(msgid[,serverctrls=None[,clientctrls=None]]) -> None
diff --git a/Modules/LDAPObject.c b/Modules/LDAPObject.c
@@ -1505,6 +1505,29 @@ l_ldap_extended_operation(LDAPObject *self, PyObject *args)
     return PyInt_FromLong(msgid);
 }
 
+/* ldap_connect */
+
+#if LDAP_VENDOR_VERSION >= 20500
+static PyObject *
+l_ldap_connect(LDAPObject *self, PyObject Py_UNUSED(args))
+{
+    int ldaperror;
+
+    if (not_valid(self))
+        return NULL;
+
+    LDAP_BEGIN_ALLOW_THREADS(self);
+    ldaperror = ldap_connect(self->ldap);
+    LDAP_END_ALLOW_THREADS(self);
+
+    if ( ldaperror != LDAP_SUCCESS )
+        return LDAPerror(self->ldap);
+
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+#endif
+
 /* methods */
 
 static PyMethodDef methods[] = {
@@ -1534,6 +1557,9 @@ static PyMethodDef methods[] = {
     {"cancel", (PyCFunction)l_ldap_cancel, METH_VARARGS},
 #endif
     {"extop", (PyCFunction)l_ldap_extended_operation, METH_VARARGS},
+#if LDAP_VENDOR_VERSION >= 20500
+    {"connect", (PyCFunction)l_ldap_connect, METH_NOARGS},
+#endif
     {NULL, NULL}
 };
 
diff --git a/Tests/t_cext.py b/Tests/t_cext.py
@@ -280,6 +280,19 @@ def test_simple_anonymous_bind(self):
         self.assertEqual(pmsg, [])
         self.assertEqual(ctrls, [])
 
+    @unittest.skipUnless(
+        _ldap.VENDOR_VERSION >= 20500,
+        reason="Test requires libldap 2.5+"
+    )
+    def test_connect(self):
+        l = self._open_conn(bind=False)
+        invalid_fileno = l.get_option(_ldap.OPT_DESC)
+        l.connect()
+        fileno = l.get_option(_ldap.OPT_DESC)
+        assertNotEqual(invalid_fileno, fileno)
+
+        self._bind_conn(l)
+
     def test_anon_rootdse_search(self):
         l = self._open_conn(bind=False)
         # see if we can get the rootdse with anon search (without prior bind)
