@@ -415,7 +415,7 @@ l_ldap_unbind_ext(LDAPObject *self, PyObject *args)
415
415
LDAPControl_List_DEL (client_ldcs );
416
416
417
417
if (ldaperror != LDAP_SUCCESS )
418
- return LDAPerror (self -> ldap , "ldap_unbind_ext" );
418
+ return LDAPerror (self -> ldap , "ldap_unbind_ext" , NULL );
419
419
420
420
self -> valid = 0 ;
421
421
Py_INCREF (Py_None );
@@ -461,7 +461,7 @@ l_ldap_abandon_ext(LDAPObject *self, PyObject *args)
461
461
LDAPControl_List_DEL (client_ldcs );
462
462
463
463
if (ldaperror != LDAP_SUCCESS )
464
- return LDAPerror (self -> ldap , "ldap_abandon_ext" );
464
+ return LDAPerror (self -> ldap , "ldap_abandon_ext" , NULL );
465
465
466
466
Py_INCREF (Py_None );
467
467
return Py_None ;
@@ -517,7 +517,7 @@ l_ldap_add_ext(LDAPObject *self, PyObject *args)
517
517
LDAPControl_List_DEL (client_ldcs );
518
518
519
519
if (ldaperror != LDAP_SUCCESS )
520
- return LDAPerror (self -> ldap , "ldap_add_ext" );
520
+ return LDAPerror (self -> ldap , "ldap_add_ext" , NULL );
521
521
522
522
return PyInt_FromLong (msgid );
523
523
}
@@ -568,7 +568,7 @@ l_ldap_simple_bind(LDAPObject *self, PyObject *args)
568
568
LDAPControl_List_DEL (client_ldcs );
569
569
570
570
if (ldaperror != LDAP_SUCCESS )
571
- return LDAPerror (self -> ldap , "ldap_simple_bind" );
571
+ return LDAPerror (self -> ldap , "ldap_simple_bind" , NULL );
572
572
573
573
return PyInt_FromLong (msgid );
574
574
}
@@ -727,7 +727,7 @@ l_ldap_sasl_bind_s(LDAPObject *self, PyObject *args)
727
727
servercred -> bv_len );
728
728
}
729
729
else if (ldaperror != LDAP_SUCCESS )
730
- return LDAPerror (self -> ldap , "l_ldap_sasl_bind_s" );
730
+ return LDAPerror (self -> ldap , "l_ldap_sasl_bind_s" , NULL );
731
731
return PyInt_FromLong (ldaperror );
732
732
}
733
733
@@ -806,7 +806,7 @@ l_ldap_sasl_interactive_bind_s(LDAPObject *self, PyObject *args)
806
806
LDAPControl_List_DEL (client_ldcs );
807
807
808
808
if (msgid != LDAP_SUCCESS )
809
- return LDAPerror (self -> ldap , "ldap_sasl_interactive_bind_s" );
809
+ return LDAPerror (self -> ldap , "ldap_sasl_interactive_bind_s" , NULL );
810
810
return PyInt_FromLong (msgid );
811
811
}
812
812
#endif
@@ -854,7 +854,7 @@ l_ldap_cancel(LDAPObject *self, PyObject *args)
854
854
LDAPControl_List_DEL (client_ldcs );
855
855
856
856
if (ldaperror != LDAP_SUCCESS )
857
- return LDAPerror (self -> ldap , "ldap_cancel" );
857
+ return LDAPerror (self -> ldap , "ldap_cancel" , NULL );
858
858
859
859
return PyInt_FromLong (msgid );
860
860
}
@@ -908,7 +908,7 @@ l_ldap_compare_ext(LDAPObject *self, PyObject *args)
908
908
LDAPControl_List_DEL (client_ldcs );
909
909
910
910
if (ldaperror != LDAP_SUCCESS )
911
- return LDAPerror (self -> ldap , "ldap_compare_ext" );
911
+ return LDAPerror (self -> ldap , "ldap_compare_ext" , NULL );
912
912
913
913
return PyInt_FromLong (msgid );
914
914
}
@@ -954,7 +954,7 @@ l_ldap_delete_ext(LDAPObject *self, PyObject *args)
954
954
LDAPControl_List_DEL (client_ldcs );
955
955
956
956
if (ldaperror != LDAP_SUCCESS )
957
- return LDAPerror (self -> ldap , "ldap_delete_ext" );
957
+ return LDAPerror (self -> ldap , "ldap_delete_ext" , NULL );
958
958
959
959
return PyInt_FromLong (msgid );
960
960
}
@@ -1011,7 +1011,7 @@ l_ldap_modify_ext(LDAPObject *self, PyObject *args)
1011
1011
LDAPControl_List_DEL (client_ldcs );
1012
1012
1013
1013
if (ldaperror != LDAP_SUCCESS )
1014
- return LDAPerror (self -> ldap , "ldap_modify_ext" );
1014
+ return LDAPerror (self -> ldap , "ldap_modify_ext" , NULL );
1015
1015
1016
1016
return PyInt_FromLong (msgid );
1017
1017
}
@@ -1061,7 +1061,7 @@ l_ldap_rename(LDAPObject *self, PyObject *args)
1061
1061
LDAPControl_List_DEL (client_ldcs );
1062
1062
1063
1063
if (ldaperror != LDAP_SUCCESS )
1064
- return LDAPerror (self -> ldap , "ldap_rename" );
1064
+ return LDAPerror (self -> ldap , "ldap_rename" , NULL );
1065
1065
1066
1066
return PyInt_FromLong (msgid );
1067
1067
}
@@ -1109,7 +1109,7 @@ l_ldap_result4(LDAPObject *self, PyObject *args)
1109
1109
LDAP_END_ALLOW_THREADS (self );
1110
1110
1111
1111
if (res_type < 0 ) /* LDAP or system error */
1112
- return LDAPerror (self -> ldap , "ldap_result4" );
1112
+ return LDAPerror (self -> ldap , "ldap_result4" , msg );
1113
1113
1114
1114
if (res_type == 0 ) {
1115
1115
/* Polls return (None, None, None, None); timeouts raise an exception */
@@ -1172,9 +1172,8 @@ l_ldap_result4(LDAPObject *self, PyObject *args)
1172
1172
else
1173
1173
e = "ldap_parse_result" ;
1174
1174
ldap_controls_free (serverctrls );
1175
- ldap_msgfree (msg );
1176
1175
Py_XDECREF (valuestr );
1177
- return LDAPerror (self -> ldap , e );
1176
+ return LDAPerror (self -> ldap , e , msg );
1178
1177
}
1179
1178
1180
1179
if (!(pyctrls = LDAPControls_to_List (serverctrls ))) {
@@ -1186,7 +1185,7 @@ l_ldap_result4(LDAPObject *self, PyObject *args)
1186
1185
ldap_controls_free (serverctrls );
1187
1186
ldap_msgfree (msg );
1188
1187
Py_XDECREF (valuestr );
1189
- return LDAPerror (self -> ldap , "LDAPControls_to_List" );
1188
+ return LDAPerror (self -> ldap , "LDAPControls_to_List" , NULL );
1190
1189
}
1191
1190
ldap_controls_free (serverctrls );
1192
1191
@@ -1287,7 +1286,7 @@ l_ldap_search_ext(LDAPObject *self, PyObject *args)
1287
1286
LDAPControl_List_DEL (client_ldcs );
1288
1287
1289
1288
if (ldaperror != LDAP_SUCCESS )
1290
- return LDAPerror (self -> ldap , "ldap_search_ext" );
1289
+ return LDAPerror (self -> ldap , "ldap_search_ext" , NULL );
1291
1290
1292
1291
return PyInt_FromLong (msgid );
1293
1292
}
@@ -1334,7 +1333,7 @@ l_ldap_whoami_s(LDAPObject *self, PyObject *args)
1334
1333
1335
1334
if (ldaperror != LDAP_SUCCESS ) {
1336
1335
ber_bvfree (bvalue );
1337
- return LDAPerror (self -> ldap , "ldap_whoami_s" );
1336
+ return LDAPerror (self -> ldap , "ldap_whoami_s" , NULL );
1338
1337
}
1339
1338
1340
1339
result = LDAPberval_to_unicode_object (bvalue );
@@ -1361,7 +1360,7 @@ l_ldap_start_tls_s(LDAPObject *self, PyObject *args)
1361
1360
LDAP_END_ALLOW_THREADS (self );
1362
1361
if (ldaperror != LDAP_SUCCESS ) {
1363
1362
ldap_set_option (self -> ldap , LDAP_OPT_ERROR_NUMBER , & ldaperror );
1364
- return LDAPerror (self -> ldap , "ldap_start_tls_s" );
1363
+ return LDAPerror (self -> ldap , "ldap_start_tls_s" , NULL );
1365
1364
}
1366
1365
1367
1366
Py_INCREF (Py_None );
@@ -1453,7 +1452,7 @@ l_ldap_passwd(LDAPObject *self, PyObject *args)
1453
1452
LDAPControl_List_DEL (client_ldcs );
1454
1453
1455
1454
if (ldaperror != LDAP_SUCCESS )
1456
- return LDAPerror (self -> ldap , "ldap_passwd" );
1455
+ return LDAPerror (self -> ldap , "ldap_passwd" , NULL );
1457
1456
1458
1457
return PyInt_FromLong (msgid );
1459
1458
}
@@ -1504,7 +1503,7 @@ l_ldap_extended_operation(LDAPObject *self, PyObject *args)
1504
1503
LDAPControl_List_DEL (client_ldcs );
1505
1504
1506
1505
if (ldaperror != LDAP_SUCCESS )
1507
- return LDAPerror (self -> ldap , "ldap_extended_operation" );
1506
+ return LDAPerror (self -> ldap , "ldap_extended_operation" , NULL );
1508
1507
1509
1508
return PyInt_FromLong (msgid );
1510
1509
}
0 commit comments