@@ -76,10 +76,12 @@ add_err(TOO_LATE);
7676add_err (CANNOT_CANCEL );
7777#endif
7878
79+
7980#if defined(LDAP_ASSERTION_FAILED )
8081add_err (ASSERTION_FAILED );
8182#endif
8283
84+
8385#if defined(LDAP_PROXIED_AUTHORIZATION_DENIED )
8486add_err (PROXIED_AUTHORIZATION_DENIED );
8587#endif
@@ -192,6 +194,7 @@ add_int(OPT_URI);
192194add_int (OPT_DEFBASE );
193195#endif
194196
197+
195198#if HAVE_TLS
196199
197200#if defined(LDAP_OPT_X_TLS )
@@ -217,18 +220,22 @@ add_int(OPT_X_TLS_TRY);
217220add_int (OPT_X_TLS_VERSION );
218221#endif
219222
223+
220224#if defined(LDAP_OPT_X_TLS_CIPHER )
221225add_int (OPT_X_TLS_CIPHER );
222226#endif
223227
228+
224229#if defined(LDAP_OPT_X_TLS_PEERCERT )
225230add_int (OPT_X_TLS_PEERCERT );
226231#endif
227232
233+
228234#if defined(LDAP_OPT_X_TLS_CRLCHECK )
229235add_int (OPT_X_TLS_CRLCHECK );
230236#endif
231237
238+
232239#if defined(LDAP_OPT_X_TLS_CRLFILE )
233240add_int (OPT_X_TLS_CRLFILE );
234241#endif
@@ -241,14 +248,17 @@ add_int(OPT_X_TLS_CRL_ALL);
241248add_int (OPT_X_TLS_NEWCTX );
242249#endif
243250
251+
244252#if defined(LDAP_OPT_X_TLS_PROTOCOL_MIN )
245253add_int (OPT_X_TLS_PROTOCOL_MIN );
246254#endif
247255
256+
248257#if defined(LDAP_OPT_X_TLS_PACKAGE )
249258add_int (OPT_X_TLS_PACKAGE );
250259#endif
251260
261+
252262#if defined(LDAP_OPT_X_TLS_REQUIRE_SAN )
253263add_int (OPT_X_TLS_REQUIRE_SAN );
254264#endif
@@ -269,22 +279,27 @@ add_int(OPT_X_SASL_SSF_MAX);
269279add_int (OPT_X_SASL_NOCANON );
270280#endif
271281
282+
272283#if defined(LDAP_OPT_X_SASL_USERNAME )
273284add_int (OPT_X_SASL_USERNAME );
274285#endif
275286
287+
276288#if defined(LDAP_OPT_CONNECT_ASYNC )
277289add_int (OPT_CONNECT_ASYNC );
278290#endif
279291
292+
280293#if defined(LDAP_OPT_X_KEEPALIVE_IDLE )
281294add_int (OPT_X_KEEPALIVE_IDLE );
282295#endif
283296
297+
284298#if defined(LDAP_OPT_X_KEEPALIVE_PROBES )
285299add_int (OPT_X_KEEPALIVE_PROBES );
286300#endif
287301
302+
288303#if defined(LDAP_OPT_X_KEEPALIVE_INTERVAL )
289304add_int (OPT_X_KEEPALIVE_INTERVAL );
290305#endif
@@ -309,36 +324,24 @@ add_int(OPT_SUCCESS);
309324add_int (URL_ERR_BADSCOPE );
310325add_int (URL_ERR_MEM );
311326
312- #ifdef HAVE_LIBLDAP_R
313- if (PyModule_AddIntConstant (m , "LIBLDAP_R" , 1 ) != 0 )
314- return -1 ;
315- #else
316- if (PyModule_AddIntConstant (m , "LIBLDAP_R" , 0 ) != 0 )
317- return -1 ;
318- #endif
319-
320327#ifdef HAVE_SASL
321- if (PyModule_AddIntConstant (m , "SASL_AVAIL" , 1 ) != 0 )
322- return -1 ;
328+ if (PyModule_AddIntConstant (m , "SASL_AVAIL" , 1 ) != 0 ) return -1 ;
323329#else
324- if (PyModule_AddIntConstant (m , "SASL_AVAIL" , 0 ) != 0 )
325- return -1 ;
330+ if (PyModule_AddIntConstant (m , "SASL_AVAIL" , 0 ) != 0 ) return -1 ;
326331#endif
327332
333+
328334#ifdef HAVE_TLS
329- if (PyModule_AddIntConstant (m , "TLS_AVAIL" , 1 ) != 0 )
330- return -1 ;
335+ if (PyModule_AddIntConstant (m , "TLS_AVAIL" , 1 ) != 0 ) return -1 ;
331336#else
332- if (PyModule_AddIntConstant (m , "TLS_AVAIL" , 0 ) != 0 )
333- return -1 ;
337+ if (PyModule_AddIntConstant (m , "TLS_AVAIL" , 0 ) != 0 ) return -1 ;
334338#endif
335339
340+
336341#ifdef HAVE_LDAP_INIT_FD
337- if (PyModule_AddIntConstant (m , "INIT_FD_AVAIL" , 1 ) != 0 )
338- return -1 ;
342+ if (PyModule_AddIntConstant (m , "INIT_FD_AVAIL" , 1 ) != 0 ) return -1 ;
339343#else
340- if (PyModule_AddIntConstant (m , "INIT_FD_AVAIL" , 0 ) != 0 )
341- return -1 ;
344+ if (PyModule_AddIntConstant (m , "INIT_FD_AVAIL" , 0 ) != 0 ) return -1 ;
342345#endif
343346
344347add_string (CONTROL_MANAGEDSAIT );
0 commit comments