|
Lines 746-756
Link Here
|
| 746 |
if (ret) |
746 |
if (ret) |
| 747 |
goto out; |
747 |
goto out; |
| 748 |
|
748 |
|
| 749 |
rc = ldap_search_s(HDB2LDAP(db), dn, LDAP_SCOPE_SUBTREE, |
749 |
rc = ldap_search_ext_s(HDB2LDAP(db), dn, LDAP_SCOPE_SUBTREE, |
| 750 |
filter, krb5principal_attrs, |
750 |
filter, krb5principal_attrs, 0, |
|
|
751 |
NULL, NULL, NULL, |
| 751 |
0, &res); |
752 |
0, &res); |
| 752 |
if (check_ldap(context, db, rc)) { |
753 |
if (check_ldap(context, db, rc)) { |
| 753 |
krb5_set_error_string(context, "ldap_search_s: filter: %s error: %s", |
754 |
krb5_set_error_string(context, "ldap_search_ext_s: filter: %s error: %s", |
| 754 |
filter, ldap_err2string(rc)); |
755 |
filter, ldap_err2string(rc)); |
| 755 |
ret = HDB_ERR_NOENTRY; |
756 |
ret = HDB_ERR_NOENTRY; |
| 756 |
goto out; |
757 |
goto out; |
|
Lines 806-815
Link Here
|
| 806 |
if (ret) |
807 |
if (ret) |
| 807 |
goto out; |
808 |
goto out; |
| 808 |
|
809 |
|
| 809 |
rc = ldap_search_s(HDB2LDAP(db), HDB2BASE(db), LDAP_SCOPE_SUBTREE, filter, |
810 |
rc = ldap_search_ext_s(HDB2LDAP(db), HDB2BASE(db), LDAP_SCOPE_SUBTREE, filter, |
| 810 |
krb5kdcentry_attrs, 0, msg); |
811 |
krb5kdcentry_attrs, 0, |
|
|
812 |
NULL, NULL, NULL, |
| 813 |
0, msg); |
| 811 |
if (check_ldap(context, db, rc)) { |
814 |
if (check_ldap(context, db, rc)) { |
| 812 |
krb5_set_error_string(context, "ldap_search_s: filter: %s - error: %s", |
815 |
krb5_set_error_string(context, "ldap_search_ext_s: filter: %s - error: %s", |
| 813 |
filter, ldap_err2string(rc)); |
816 |
filter, ldap_err2string(rc)); |
| 814 |
ret = HDB_ERR_NOENTRY; |
817 |
ret = HDB_ERR_NOENTRY; |
| 815 |
goto out; |
818 |
goto out; |
|
Lines 834-844
Link Here
|
| 834 |
if (ret) |
837 |
if (ret) |
| 835 |
goto out; |
838 |
goto out; |
| 836 |
|
839 |
|
| 837 |
rc = ldap_search_s(HDB2LDAP(db), HDB2BASE(db), LDAP_SCOPE_SUBTREE, |
840 |
rc = ldap_search_ext_s(HDB2LDAP(db), HDB2BASE(db), LDAP_SCOPE_SUBTREE, |
| 838 |
filter, krb5kdcentry_attrs, 0, msg); |
841 |
filter, krb5kdcentry_attrs, 0, |
|
|
842 |
NULL, NULL, NULL, |
| 843 |
0, msg); |
| 839 |
if (check_ldap(context, db, rc)) { |
844 |
if (check_ldap(context, db, rc)) { |
| 840 |
krb5_set_error_string(context, |
845 |
krb5_set_error_string(context, |
| 841 |
"ldap_search_s: filter: %s error: %s", |
846 |
"ldap_search_ext_s: filter: %s error: %s", |
| 842 |
filter, ldap_err2string(rc)); |
847 |
filter, ldap_err2string(rc)); |
| 843 |
ret = HDB_ERR_NOENTRY; |
848 |
ret = HDB_ERR_NOENTRY; |
| 844 |
goto out; |
849 |
goto out; |
|
Lines 1366-1372
Link Here
|
| 1366 |
&& parserc != LDAP_MORE_RESULTS_TO_RETURN) { |
1371 |
&& parserc != LDAP_MORE_RESULTS_TO_RETURN) { |
| 1367 |
krb5_set_error_string(context, "ldap_parse_result: %s", |
1372 |
krb5_set_error_string(context, "ldap_parse_result: %s", |
| 1368 |
ldap_err2string(parserc)); |
1373 |
ldap_err2string(parserc)); |
| 1369 |
ldap_abandon(HDB2LDAP(db), msgid); |
1374 |
ldap_abandon_ext(HDB2LDAP(db), msgid, NULL, NULL ); |
| 1370 |
} |
1375 |
} |
| 1371 |
ret = HDB_ERR_NOENTRY; |
1376 |
ret = HDB_ERR_NOENTRY; |
| 1372 |
HDBSETMSGID(db, -1); |
1377 |
HDBSETMSGID(db, -1); |
|
Lines 1380-1386
Link Here
|
| 1380 |
default: |
1385 |
default: |
| 1381 |
/* Some unspecified error (timeout?). Abandon. */ |
1386 |
/* Some unspecified error (timeout?). Abandon. */ |
| 1382 |
ldap_msgfree(e); |
1387 |
ldap_msgfree(e); |
| 1383 |
ldap_abandon(HDB2LDAP(db), msgid); |
1388 |
ldap_abandon_ext(HDB2LDAP(db), msgid, NULL, NULL ); |
| 1384 |
ret = HDB_ERR_NOENTRY; |
1389 |
ret = HDB_ERR_NOENTRY; |
| 1385 |
HDBSETMSGID(db, -1); |
1390 |
HDBSETMSGID(db, -1); |
| 1386 |
break; |
1391 |
break; |
|
Lines 1413-1422
Link Here
|
| 1413 |
if (ret) |
1418 |
if (ret) |
| 1414 |
return ret; |
1419 |
return ret; |
| 1415 |
|
1420 |
|
| 1416 |
msgid = ldap_search(HDB2LDAP(db), HDB2BASE(db), |
1421 |
ret = ldap_search_ext(HDB2LDAP(db), HDB2BASE(db), |
| 1417 |
LDAP_SCOPE_SUBTREE, |
1422 |
LDAP_SCOPE_SUBTREE, |
| 1418 |
"(|(objectClass=krb5Principal)(objectClass=sambaSamAccount))", |
1423 |
"(|(objectClass=krb5Principal)(objectClass=sambaSamAccount))", |
| 1419 |
krb5kdcentry_attrs, 0); |
1424 |
krb5kdcentry_attrs, 0, |
|
|
1425 |
NULL, NULL, NULL, 0, &msgid); |
| 1420 |
if (msgid < 0) |
1426 |
if (msgid < 0) |
| 1421 |
return HDB_ERR_NOENTRY; |
1427 |
return HDB_ERR_NOENTRY; |
| 1422 |
|
1428 |
|
|
Lines 1588-1599
Link Here
|
| 1588 |
/* write entry into directory */ |
1594 |
/* write entry into directory */ |
| 1589 |
if (e == NULL) { |
1595 |
if (e == NULL) { |
| 1590 |
/* didn't exist before */ |
1596 |
/* didn't exist before */ |
| 1591 |
rc = ldap_add_s(HDB2LDAP(db), dn, mods); |
1597 |
rc = ldap_add_ext_s(HDB2LDAP(db), dn, mods, NULL, NULL ); |
| 1592 |
errfn = "ldap_add_s"; |
1598 |
errfn = "ldap_add_ext_s"; |
| 1593 |
} else { |
1599 |
} else { |
| 1594 |
/* already existed, send deltas only */ |
1600 |
/* already existed, send deltas only */ |
| 1595 |
rc = ldap_modify_s(HDB2LDAP(db), dn, mods); |
1601 |
rc = ldap_modify_ext_s(HDB2LDAP(db), dn, mods, NULL, NULL ); |
| 1596 |
errfn = "ldap_modify_s"; |
1602 |
errfn = "ldap_modify_ext_s"; |
| 1597 |
} |
1603 |
} |
| 1598 |
|
1604 |
|
| 1599 |
if (check_ldap(context, db, rc)) { |
1605 |
if (check_ldap(context, db, rc)) { |
|
Lines 1652-1660
Link Here
|
| 1652 |
goto out; |
1658 |
goto out; |
| 1653 |
} |
1659 |
} |
| 1654 |
|
1660 |
|
| 1655 |
rc = ldap_delete_s(HDB2LDAP(db), dn); |
1661 |
rc = ldap_delete_ext_s(HDB2LDAP(db), dn, NULL, NULL ); |
| 1656 |
if (check_ldap(context, db, rc)) { |
1662 |
if (check_ldap(context, db, rc)) { |
| 1657 |
krb5_set_error_string(context, "ldap_delete_s: %s", |
1663 |
krb5_set_error_string(context, "ldap_delete_ext_s: %s", |
| 1658 |
ldap_err2string(rc)); |
1664 |
ldap_err2string(rc)); |
| 1659 |
ret = HDB_ERR_CANT_LOCK_DB; |
1665 |
ret = HDB_ERR_CANT_LOCK_DB; |
| 1660 |
} else |
1666 |
} else |
