Process missing libldap options

mistotebe · mistotebe · commit dbd7a3847121 · 2022-04-20T14:50:58.000+01:00
diff --git a/Lib/ldap/constants.py b/Lib/ldap/constants.py
@@ -244,6 +244,7 @@ class Str(Constant):
     Int('OPT_SIZELIMIT'),
     Int('OPT_TIMELIMIT'),
     Int('OPT_REFERRALS', optional=True),
+    Int('OPT_RESULT_CODE'),
     Int('OPT_ERROR_NUMBER'),
     Int('OPT_RESTART'),
     Int('OPT_PROTOCOL_VERSION'),
@@ -261,6 +262,7 @@ class Str(Constant):
     Int('OPT_TIMEOUT'),
     Int('OPT_REFHOPLIMIT'),
     Int('OPT_NETWORK_TIMEOUT'),
+    Int('OPT_TCP_USER_TIMEOUT', optional=True),
     Int('OPT_URI'),
 
     Int('OPT_DEFBASE', optional=True),
@@ -299,6 +301,7 @@ class Str(Constant):
     TLSInt('OPT_X_TLS_PACKAGE', optional=True),
 
     # Added in OpenLDAP 2.4.52
+    TLSInt('OPT_X_TLS_ECNAME', optional=True),
     TLSInt('OPT_X_TLS_REQUIRE_SAN', optional=True),
 
     # Added in OpenLDAP 2.5
diff --git a/Modules/constants_generated.h b/Modules/constants_generated.h
@@ -173,6 +173,7 @@ add_int(OPT_TIMELIMIT);
 add_int(OPT_REFERRALS);
 #endif
 
+add_int(OPT_RESULT_CODE);
 add_int(OPT_ERROR_NUMBER);
 add_int(OPT_RESTART);
 add_int(OPT_PROTOCOL_VERSION);
@@ -188,6 +189,11 @@ add_int(OPT_DEBUG_LEVEL);
 add_int(OPT_TIMEOUT);
 add_int(OPT_REFHOPLIMIT);
 add_int(OPT_NETWORK_TIMEOUT);
+
+#if defined(LDAP_OPT_TCP_USER_TIMEOUT)
+add_int(OPT_TCP_USER_TIMEOUT);
+#endif
+
 add_int(OPT_URI);
 
 #if defined(LDAP_OPT_DEFBASE)
@@ -259,6 +265,11 @@ add_int(OPT_X_TLS_PACKAGE);
 #endif
 
 
+#if defined(LDAP_OPT_X_TLS_ECNAME)
+add_int(OPT_X_TLS_ECNAME);
+#endif
+
+
 #if defined(LDAP_OPT_X_TLS_REQUIRE_SAN)
 add_int(OPT_X_TLS_REQUIRE_SAN);
 #endif
diff --git a/Modules/options.c b/Modules/options.c
@@ -41,6 +41,7 @@ LDAP_set_option(LDAPObject *self, int option, PyObject *value)
 {
     int res;
     int intval;
+    unsigned int uintval;
     double doubleval;
     char *strval;
     struct timeval tv;
@@ -57,6 +58,7 @@ LDAP_set_option(LDAPObject *self, int option, PyObject *value)
     switch (option) {
     case LDAP_OPT_API_INFO:
     case LDAP_OPT_API_FEATURE_INFO:
+    case LDAP_OPT_DESC:
 #ifdef HAVE_SASL
     case LDAP_OPT_X_SASL_SSF:
 #endif
@@ -116,10 +118,19 @@ LDAP_set_option(LDAPObject *self, int option, PyObject *value)
         ptr = &intval;
         break;
 
+#ifdef LDAP_OPT_TCP_USER_TIMEOUT
+    case LDAP_OPT_TCP_USER_TIMEOUT:
+#endif
+        if (!PyArg_Parse(value, "I:set_option", &uintval))
+            return 0;
+        ptr = &uintval;
+        break;
+
 #ifdef HAVE_SASL
     case LDAP_OPT_X_SASL_SSF_MIN:
     case LDAP_OPT_X_SASL_SSF_MAX:
     case LDAP_OPT_X_SASL_SSF_EXTERNAL:
+    case LDAP_OPT_X_SASL_MAXBUFSIZE:
         if (!PyArg_Parse(value, "k:set_option", &blen))
             return 0;
         ptr = &blen;
@@ -144,9 +155,15 @@ LDAP_set_option(LDAPObject *self, int option, PyObject *value)
 #ifdef LDAP_OPT_X_TLS_CRLFILE
     case LDAP_OPT_X_TLS_CRLFILE:
 #endif
+#ifdef LDAP_OPT_X_TLS_ECNAME
+    case LDAP_OPT_X_TLS_ECNAME:
+#endif
 #endif
 #ifdef HAVE_SASL
     case LDAP_OPT_X_SASL_SECPROPS:
+#endif
+#ifdef LDAP_OPT_SOCKET_BIND_ADDRESSES
+    case LDAP_OPT_SOCKET_BIND_ADDRESSES:
 #endif
         /* String valued options */
         if (!PyArg_Parse(value, "s:set_option", &strval))
@@ -187,8 +204,8 @@ LDAP_set_option(LDAPObject *self, int option, PyObject *value)
         }
         else {
             PyErr_Format(PyExc_ValueError,
-                         "timeout must be >= 0 or -1/None for infinity, got %d",
-                         option);
+                         "timeout must be >= 0 or -1/None for infinity, got %f",
+                         doubleval);
             return 0;
         }
         break;
@@ -254,6 +271,7 @@ LDAP_get_option(LDAPObject *self, int option)
 {
     int res;
     int intval;
+    unsigned int uintval;
     struct timeval *tv;
     LDAPAPIInfo apiinfo;
     LDAPControl **lcs;
@@ -268,6 +286,7 @@ LDAP_get_option(LDAPObject *self, int option)
 
     switch (option) {
 #ifdef HAVE_SASL
+    case LDAP_OPT_X_SASL_SECPROPS:
     case LDAP_OPT_X_SASL_SSF_EXTERNAL:
         /* Write-only options */
         PyErr_SetString(PyExc_ValueError, "write-only option");
@@ -350,10 +369,20 @@ LDAP_get_option(LDAPObject *self, int option)
             return option_error(res, "ldap_get_option");
         return PyInt_FromLong(intval);
 
+#ifdef LDAP_OPT_TCP_USER_TIMEOUT
+    case LDAP_OPT_TCP_USER_TIMEOUT:
+#endif
+        /* unsigned int options */
+        res = LDAP_int_get_option(self, option, &uintval);
+        if (res != LDAP_OPT_SUCCESS)
+            return option_error(res, "ldap_get_option");
+        return PyLong_FromUnsignedLong(uintval);
+
 #ifdef HAVE_SASL
     case LDAP_OPT_X_SASL_SSF:
     case LDAP_OPT_X_SASL_SSF_MIN:
     case LDAP_OPT_X_SASL_SSF_MAX:
+    case LDAP_OPT_X_SASL_MAXBUFSIZE:
         /* ber_len_t options (unsigned long)*/
         res = LDAP_int_get_option(self, option, &blen);
         if (res != LDAP_OPT_SUCCESS)
@@ -388,16 +417,21 @@ LDAP_get_option(LDAPObject *self, int option)
 #ifdef LDAP_OPT_X_TLS_PACKAGE
     case LDAP_OPT_X_TLS_PACKAGE:
 #endif
+#ifdef LDAP_OPT_X_TLS_ECNAME
+    case LDAP_OPT_X_TLS_ECNAME:
+#endif
 #endif
 #ifdef HAVE_SASL
-    case LDAP_OPT_X_SASL_SECPROPS:
     case LDAP_OPT_X_SASL_MECH:
     case LDAP_OPT_X_SASL_REALM:
     case LDAP_OPT_X_SASL_AUTHCID:
     case LDAP_OPT_X_SASL_AUTHZID:
 #ifdef LDAP_OPT_X_SASL_USERNAME
     case LDAP_OPT_X_SASL_USERNAME:
 #endif
+#endif
+#ifdef LDAP_OPT_SOCKET_BIND_ADDRESSES
+    case LDAP_OPT_SOCKET_BIND_ADDRESSES:
 #endif
         /* String-valued options */
         res = LDAP_int_get_option(self, option, &strval);
