Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 149521 Details for
Bug 185899
app-crypt/heimdal-1.x series
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
heimdal-1.1-ldapQAplus.patch
heimdal-1.1-ldapQAplus.patch (text/plain), 3.69 KB, created by
Honza Macháček
on 2008-04-12 21:52:13 UTC
(
hide
)
Description:
heimdal-1.1-ldapQAplus.patch
Filename:
MIME Type:
Creator:
Honza Macháček
Created:
2008-04-12 21:52:13 UTC
Size:
3.69 KB
patch
obsolete
>--- lib/hdb/hdb-ldap.c 2008-04-09 19:43:39.000000000 +0000 >+++ lib/hdb/hdb-ldap.c 2008-04-12 21:21:59.000000000 +0000 >@@ -746,11 +746,12 @@ > if (ret) > goto out; > >- rc = ldap_search_s(HDB2LDAP(db), dn, LDAP_SCOPE_SUBTREE, >- filter, krb5principal_attrs, >+ rc = ldap_search_ext_s(HDB2LDAP(db), dn, LDAP_SCOPE_SUBTREE, >+ filter, krb5principal_attrs, 0, >+ NULL, NULL, NULL, > 0, &res); > if (check_ldap(context, db, rc)) { >- krb5_set_error_string(context, "ldap_search_s: filter: %s error: %s", >+ krb5_set_error_string(context, "ldap_search_ext_s: filter: %s error: %s", > filter, ldap_err2string(rc)); > ret = HDB_ERR_NOENTRY; > goto out; >@@ -806,10 +807,12 @@ > if (ret) > goto out; > >- rc = ldap_search_s(HDB2LDAP(db), HDB2BASE(db), LDAP_SCOPE_SUBTREE, filter, >- krb5kdcentry_attrs, 0, msg); >+ rc = ldap_search_ext_s(HDB2LDAP(db), HDB2BASE(db), LDAP_SCOPE_SUBTREE, filter, >+ krb5kdcentry_attrs, 0, >+ NULL, NULL, NULL, >+ 0, msg); > if (check_ldap(context, db, rc)) { >- krb5_set_error_string(context, "ldap_search_s: filter: %s - error: %s", >+ krb5_set_error_string(context, "ldap_search_ext_s: filter: %s - error: %s", > filter, ldap_err2string(rc)); > ret = HDB_ERR_NOENTRY; > goto out; >@@ -834,11 +837,13 @@ > if (ret) > goto out; > >- rc = ldap_search_s(HDB2LDAP(db), HDB2BASE(db), LDAP_SCOPE_SUBTREE, >- filter, krb5kdcentry_attrs, 0, msg); >+ rc = ldap_search_ext_s(HDB2LDAP(db), HDB2BASE(db), LDAP_SCOPE_SUBTREE, >+ filter, krb5kdcentry_attrs, 0, >+ NULL, NULL, NULL, >+ 0, msg); > if (check_ldap(context, db, rc)) { > krb5_set_error_string(context, >- "ldap_search_s: filter: %s error: %s", >+ "ldap_search_ext_s: filter: %s error: %s", > filter, ldap_err2string(rc)); > ret = HDB_ERR_NOENTRY; > goto out; >@@ -1366,7 +1371,7 @@ > && parserc != LDAP_MORE_RESULTS_TO_RETURN) { > krb5_set_error_string(context, "ldap_parse_result: %s", > ldap_err2string(parserc)); >- ldap_abandon(HDB2LDAP(db), msgid); >+ ldap_abandon_ext(HDB2LDAP(db), msgid, NULL, NULL ); > } > ret = HDB_ERR_NOENTRY; > HDBSETMSGID(db, -1); >@@ -1380,7 +1385,7 @@ > default: > /* Some unspecified error (timeout?). Abandon. */ > ldap_msgfree(e); >- ldap_abandon(HDB2LDAP(db), msgid); >+ ldap_abandon_ext(HDB2LDAP(db), msgid, NULL, NULL ); > ret = HDB_ERR_NOENTRY; > HDBSETMSGID(db, -1); > break; >@@ -1413,10 +1418,11 @@ > if (ret) > return ret; > >- msgid = ldap_search(HDB2LDAP(db), HDB2BASE(db), >+ ret = ldap_search_ext(HDB2LDAP(db), HDB2BASE(db), > LDAP_SCOPE_SUBTREE, > "(|(objectClass=krb5Principal)(objectClass=sambaSamAccount))", >- krb5kdcentry_attrs, 0); >+ krb5kdcentry_attrs, 0, >+ NULL, NULL, NULL, 0, &msgid); > if (msgid < 0) > return HDB_ERR_NOENTRY; > >@@ -1588,12 +1594,12 @@ > /* write entry into directory */ > if (e == NULL) { > /* didn't exist before */ >- rc = ldap_add_s(HDB2LDAP(db), dn, mods); >- errfn = "ldap_add_s"; >+ rc = ldap_add_ext_s(HDB2LDAP(db), dn, mods, NULL, NULL ); >+ errfn = "ldap_add_ext_s"; > } else { > /* already existed, send deltas only */ >- rc = ldap_modify_s(HDB2LDAP(db), dn, mods); >- errfn = "ldap_modify_s"; >+ rc = ldap_modify_ext_s(HDB2LDAP(db), dn, mods, NULL, NULL ); >+ errfn = "ldap_modify_ext_s"; > } > > if (check_ldap(context, db, rc)) { >@@ -1652,9 +1658,9 @@ > goto out; > } > >- rc = ldap_delete_s(HDB2LDAP(db), dn); >+ rc = ldap_delete_ext_s(HDB2LDAP(db), dn, NULL, NULL ); > if (check_ldap(context, db, rc)) { >- krb5_set_error_string(context, "ldap_delete_s: %s", >+ krb5_set_error_string(context, "ldap_delete_ext_s: %s", > ldap_err2string(rc)); > ret = HDB_ERR_CANT_LOCK_DB; > } else
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 185899
:
125369
|
125370
|
125797
|
125799
|
125865
|
126059
|
126114
|
126115
|
126185
|
128519
|
128521
|
128523
|
128524
|
128526
|
128528
|
128529
|
128531
|
128533
|
128534
|
128536
|
128537
|
128539
|
128540
|
128541
|
128543
|
128544
|
131346
|
135345
|
138341
|
138343
|
138344
|
138345
|
138347
|
138349
|
138350
|
138352
|
138354
|
138355
|
138356
|
142119
|
142121
|
142122
|
142123
|
147692
|
147693
|
149248
|
149249
|
149519
| 149521 |
150352
|
150353
|
151392
|
151695
|
151696
|
151698
|
151699
|
151701
|
154219
|
154221
|
154223
|
155083
|
155085
|
155319
|
155321
|
155323
|
155325
|
155335
|
155973
|
155975
|
156553
|
156555
|
160062
|
160064
|
160721
|
160772
|
163190