openldap-bugs

openldap-bugs@openldap.org

1 participants
20963 discussions

Re: (ITS#8291) ./run -b hdb test007 fails
by michael＠stroeder.com 12 Dec '15

12 Dec '15

ondra(a)mistotebe.net wrote: > On Tue, Oct 27, 2015 at 09:50:10AM +0000, michael(a)stroeder.com wrote: >> Strange: testrun/test.out has zero bytes. :-/ >> But the DB files are created. >> >> Other tests with -b hdb seem to work ok. >> Maybe it's just the test script? > > I've let slapmodify honour logging settings in branch ITS8291 at > https://github.com/mistotebe/openldap, could you paste the output of > test.out with that enabled and possibly loglevel set to -1? See test.out here: http://www.stroeder.com/temp/openldap-its8291-test_out.gz Ciao, Michael.

1 0

Re: (ITS#7100) slapo-dds: entryTTL not decreasing
by michael＠stroeder.com 12 Dec '15

12 Dec '15

Michael Ströder wrote: > 1. make test fails (maybe unrelated): > >>>>> Starting test007-slapmodify for hdb... Ah, forgot ITS#8291. I will follow-up there after testing your branch ITS8291. Ciao, Michael.

1 0

Re: (ITS#7100) slapo-dds: entryTTL not decreasing
by michael＠stroeder.com 12 Dec '15

12 Dec '15

ondra(a)mistotebe.net wrote: > On Tue, Jul 22, 2014 at 07:38:26PM +0000, michael(a)stroeder.com wrote: >> Would be nice if this gets ever fixed to match the RFC. > > Hi, can you test the changes in branch ITS7100 at > https://github.com/mistotebe/openldap? Sorry for following up so late. I've tested your branch. 1. make test fails (maybe unrelated): >>>> Starting test007-slapmodify for hdb... running defines.sh Running slapadd to build slapd database... Testing modify, add, and delete using slapmodify... slapmodify failed (1)! >>>>> test007-slapmodify failed for hdb (exit 1) Makefile:302: recipe for target 'hdb-mod' failed make[2]: *** [hdb-mod] Error 1 make[2]: Leaving directory '/home/michael/src/openldap-git/mistotebe/openldap/tests' Makefile:280: recipe for target 'test' failed make[1]: *** [test] Error 2 make[1]: Leaving directory '/home/michael/src/openldap-git/mistotebe/openldap/tests' Makefile:292: recipe for target 'test' failed make: *** [test] Error 2 2. entryTTL seems now to be decreased It seems that when re-reading an entry the entryTTL is not always computed on the fly. Rather the value is decreased every ~6 seconds (not matching dds-interval). Ciao, Michael.

1 0

Re: (ITS#8337) olcDbChecksum not allowed in olcHdbConfig/olcBdbConfig
by hyc＠symas.com 12 Dec '15

12 Dec '15

kenneth.penza(a)gov.mt wrote: > Full_Name: Kenneth Penza > Version: 2.4.43 > OS: CentOS 7.1 > URL: ftp://ftp.openldap.org/incoming/ > Submission from: (NULL) (46.11.36.84) > > > olcDbChecksum is not accepted for BDB and HDB backends (whilst its documented in > the manual pages). Below please find files and steps to reproduce. Thanks for the report, fixed now in git master. > > File attached: > > configbdb.ldif - ldif file to create config database with BDB backend and > checksum enabled. Uploaded in > ftp://ftp.openldap.org/incoming/kenneth-penza-151212-configbdb.ldif > > confighdb.ldif - ldif file to create config database with HDB backend and > checksum enabled. Uploaded in > ftp://ftp.openldap.org/incoming/kenneth-penza-151212-confighdb.ldif > > Test case: > > mkdir -p /tmp/dummyconfig/slapd.d.{b,h}db > cd /tmp/dummyconfig > > slapadd -v -F slapd.d.bdb -n 0 -l configbdb.ldif > slapadd -v -F slapd.d.hdb -n 0 -l confighdb.ldif > > > For BDB it reports: > > 566c3f04 Entry (olcDatabase={2}bdb,cn=config), attribute 'olcDbChecksum' not > allowed > slapadd: dn="olcDatabase={2}bdb,cn=config" (line=1070): (65) attribute > 'olcDbChecksum' not allowed > > For HDB it reports: > > 566c41e2 Entry (olcDatabase={2}hdb,cn=config), attribute 'olcDbChecksum' not > allowed > slapadd: dn="olcDatabase={2}hdb,cn=config" (line=1070): (65) attribute > 'olcDbChecksum' not allowed > > Kenneth > > -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

(ITS#8337) olcDbChecksum not allowed in olcHdbConfig/olcBdbConfig
by kenneth.penza＠gov.mt 12 Dec '15

12 Dec '15

Full_Name: Kenneth Penza Version: 2.4.43 OS: CentOS 7.1 URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (46.11.36.84) olcDbChecksum is not accepted for BDB and HDB backends (whilst its documented in the manual pages). Below please find files and steps to reproduce. File attached: configbdb.ldif - ldif file to create config database with BDB backend and checksum enabled. Uploaded in ftp://ftp.openldap.org/incoming/kenneth-penza-151212-configbdb.ldif confighdb.ldif - ldif file to create config database with HDB backend and checksum enabled. Uploaded in ftp://ftp.openldap.org/incoming/kenneth-penza-151212-confighdb.ldif Test case: mkdir -p /tmp/dummyconfig/slapd.d.{b,h}db cd /tmp/dummyconfig slapadd -v -F slapd.d.bdb -n 0 -l configbdb.ldif slapadd -v -F slapd.d.hdb -n 0 -l confighdb.ldif For BDB it reports: 566c3f04 Entry (olcDatabase={2}bdb,cn=config), attribute 'olcDbChecksum' not allowed slapadd: dn="olcDatabase={2}bdb,cn=config" (line=1070): (65) attribute 'olcDbChecksum' not allowed For HDB it reports: 566c41e2 Entry (olcDatabase={2}hdb,cn=config), attribute 'olcDbChecksum' not allowed slapadd: dn="olcDatabase={2}hdb,cn=config" (line=1070): (65) attribute 'olcDbChecksum' not allowed Kenneth

1 0

Re: (ITS#8327) The mod->sm_numvals values is checked and not seen as valid in mods.c
by clement.oudot＠savoirfairelinux.com 09 Dec '15

09 Dec '15

I would like to mention that I just faced this problem in OpenLDAP 2.4.43 w= ith the ppolicy overlay. The bug only occurs if a default ppolicy is defined in overlay configuratio= n, but no corresponding entry in LDAP server is found. There is no bug if t= he configuration entry is found, so this is not a big deal. <=3D ldap_dn2bv(uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom)=3D0 56682739 <<< dnPrettyNormal: <uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom= >, <uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom> 56682739 conn=3D1000 op=3D0 BIND dn=3D"uid=3Dcoudot,ou=3Dusers,dc=3Dexample= ,dc=3Dcom" method=3D128 56682739 do_bind: version=3D3 dn=3D"uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc= =3Dcom" method=3D128 56682739 =3D> mdb_entry_get: ndn: "uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc= =3Dcom" 56682739 =3D> mdb_entry_get: oc: "(null)", at: "(null)" 56682739 mdb_dn2entry("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 =3D> mdb_dn2id("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 <=3D mdb_dn2id: got id=3D0x7 56682739 =3D> mdb_entry_decode: 56682739 <=3D mdb_entry_decode 56682739 =3D> mdb_entry_get: found entry: "uid=3Dcoudot,ou=3Dusers,dc=3Dexa= mple,dc=3Dcom" 56682739 mdb_entry_get: rc=3D0 56682739 =3D> mdb_entry_get: ndn: "ou=3Dbug,ou=3Dppolicy,dc=3Dexample,dc=3D= com" 56682739 =3D> mdb_entry_get: oc: "(null)", at: "(null)" 56682739 mdb_dn2entry("ou=3Dbug,ou=3Dppolicy,dc=3Dexample,dc=3Dcom") 56682739 =3D> mdb_dn2id("ou=3Dbug,ou=3Dppolicy,dc=3Dexample,dc=3Dcom") 56682739 <=3D mdb_dn2id: get failed: MDB_NOTFOUND: No matching key/data pai= r found (-30798) 56682739 =3D> mdb_entry_get: cannot find entry: "ou=3Dbug,ou=3Dppolicy,dc= =3Dexample,dc=3Dcom" 56682739 mdb_entry_get: rc=3D32 56682739 ppolicy_get: using default policy 56682739 =3D=3D> mdb_bind: dn: uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dco= m 56682739 mdb_dn2entry("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 =3D> mdb_dn2id("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 <=3D mdb_dn2id: got id=3D0x7 56682739 =3D> mdb_entry_decode: 56682739 <=3D mdb_entry_decode 56682739 =3D> access_allowed: result not in cache (userPassword) 56682739 =3D> access_allowed: auth access to "uid=3Dcoudot,ou=3Dusers,dc=3D= example,dc=3Dcom" "userPassword" requested 56682739 =3D> dn: [1] ou=3Dusers,dc=3Dexample,dc=3Dcom 56682739 =3D> acl_get: [1] matched 56682739 =3D> acl_get: [1] attr userPassword 56682739 =3D> acl_mask: access to entry "uid=3Dcoudot,ou=3Dusers,dc=3Dexamp= le,dc=3Dcom", attr "userPassword" requested 56682739 =3D> acl_mask: to value by "", (=3D0) 56682739 <=3D check a_dn_pat: uid=3Dwebsso,ou=3Dapplications,dc=3Dexample,d= c=3Dcom 56682739 <=3D check a_dn_pat: uid=3Dsyncrepl,ou=3Dapplications,dc=3Dexample= ,dc=3Dcom 56682739 <=3D check a_dn_pat: self 56682739 <=3D check a_dn_pat: * 56682739 <=3D acl_mask: [4] applying auth(=3Dxd) (stop) 56682739 <=3D acl_mask: [4] mask: auth(=3Dxd) 56682739 =3D> slap_access_allowed: auth access granted by auth(=3Dxd) 56682739 =3D> access_allowed: auth access granted by auth(=3Dxd) 56682739 send_ldap_result: conn=3D1000 op=3D0 p=3D3 56682739 send_ldap_result: err=3D49 matched=3D"" text=3D"" 56682739 =3D> mdb_entry_get: ndn: "uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc= =3Dcom" 56682739 =3D> mdb_entry_get: oc: "(null)", at: "(null)" 56682739 mdb_dn2entry("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 =3D> mdb_dn2id("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 <=3D mdb_dn2id: got id=3D0x7 56682739 =3D> mdb_entry_decode: 56682739 <=3D mdb_entry_decode 56682739 =3D> mdb_entry_get: found entry: "uid=3Dcoudot,ou=3Dusers,dc=3Dexa= mple,dc=3Dcom" 56682739 mdb_entry_get: rc=3D0 56682739 =3D> mdb_entry_get: ndn: "uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc= =3Dcom" 56682739 =3D> mdb_entry_get: oc: "(null)", at: "(null)" 56682739 mdb_dn2entry("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 =3D> mdb_dn2id("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 <=3D mdb_dn2id: got id=3D0x7 56682739 =3D> mdb_entry_decode: 56682739 <=3D mdb_entry_decode 56682739 =3D> mdb_entry_get: found entry: "uid=3Dcoudot,ou=3Dusers,dc=3Dexa= mple,dc=3Dcom" 56682739 mdb_entry_get: rc=3D0 56682739 =3D> mdb_search 56682739 mdb_dn2entry("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 =3D> mdb_dn2id("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 <=3D mdb_dn2id: got id=3D0x7 56682739 =3D> mdb_entry_decode: 56682739 <=3D mdb_entry_decode 56682739 =3D> access_allowed: search access to "uid=3Dcoudot,ou=3Dusers,dc= =3Dexample,dc=3Dcom" "entry" requested 56682739 <=3D root access granted 56682739 =3D> access_allowed: search access granted by manage(=3Dmwrscxd) 56682739 base_candidates: base: "uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3D= com" (0x00000007) 56682739 =3D> test_filter 56682739 EQUALITY 56682739 =3D> access_allowed: search access to "uid=3Dcoudot,ou=3Dusers,dc= =3Dexample,dc=3Dcom" "objectClass" requested 56682739 <=3D root access granted 56682739 =3D> access_allowed: search access granted by manage(=3Dmwrscxd) 56682739 <=3D test_filter 5 56682739 mdb_search: 7 does not match filter 56682739 send_ldap_result: conn=3D1000 op=3D0 p=3D3 56682739 send_ldap_result: err=3D0 matched=3D"" text=3D"" 56682739 constraint_update() 56682739 =3D> mdb_entry_get: ndn: "uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc= =3Dcom" 56682739 =3D> mdb_entry_get: oc: "(null)", at: "(null)" 56682739 mdb_dn2entry("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 =3D> mdb_dn2id("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 <=3D mdb_dn2id: got id=3D0x7 56682739 =3D> mdb_entry_decode: 56682739 <=3D mdb_entry_decode 56682739 =3D> mdb_entry_get: found entry: "uid=3Dcoudot,ou=3Dusers,dc=3Dexa= mple,dc=3Dcom" 56682739 mdb_entry_get: rc=3D0 56682739 =3D> mdb_entry_get: ndn: "uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc= =3Dcom" 56682739 =3D> mdb_entry_get: oc: "(null)", at: "(null)" 56682739 mdb_dn2entry("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 =3D> mdb_dn2id("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 <=3D mdb_dn2id: got id=3D0x7 56682739 =3D> mdb_entry_decode: 56682739 <=3D mdb_entry_decode 56682739 =3D> mdb_entry_get: found entry: "uid=3Dcoudot,ou=3Dusers,dc=3Dexa= mple,dc=3Dcom" 56682739 mdb_entry_get: rc=3D0 56682739 =3D> mdb_entry_get: ndn: "ou=3Dbug,ou=3Dppolicy,dc=3Dexample,dc=3D= com" 56682739 =3D> mdb_entry_get: oc: "(null)", at: "(null)" 56682739 mdb_dn2entry("ou=3Dbug,ou=3Dppolicy,dc=3Dexample,dc=3Dcom") 56682739 =3D> mdb_dn2id("ou=3Dbug,ou=3Dppolicy,dc=3Dexample,dc=3Dcom") 56682739 <=3D mdb_dn2id: get failed: MDB_NOTFOUND: No matching key/data pai= r found (-30798) 56682739 =3D> mdb_entry_get: cannot find entry: "ou=3Dbug,ou=3Dppolicy,dc= =3Dexample,dc=3Dcom" 56682739 mdb_entry_get: rc=3D32 56682739 ppolicy_get: using default policy 56682739 mdb_modify: uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom 56682739 slap_queue_csn: queueing 0x7fb05c104370 20151209130601.318371Z#000= 000#001#000000 56682739 mdb_dn2entry("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 =3D> mdb_dn2id("uid=3Dcoudot,ou=3Dusers,dc=3Dexample,dc=3Dcom") 56682739 <=3D mdb_dn2id: got id=3D0x7 56682739 =3D> mdb_entry_decode: 56682739 <=3D mdb_entry_decode 56682739 mdb_modify_internal: 0x00000007: uid=3Dcoudot,ou=3Dusers,dc=3Dexam= ple,dc=3Dcom 56682739 <=3D acl_access_allowed: granted to database root 56682739 mdb_modify_internal: replace pwdFailureTime slapd: mods.c:64: modify_add_values: Assertion `mod->sm_numvals =3D=3D i' f= ailed. Aborted (core dumped) Should be fixed by the patch done for this ITS, but I have not yet tested i= t. --=20 Cl=C3=A9ment OUDOT Consultant en logiciels libres, Expert infrastructure et s=C3=A9curit=C3=A9 Savoir-faire Linux

1 0

Re: (ITS#8336) assert(NUMKEYS(mp) > 1) in mdb_page_search_root()
by hyc＠symas.com 08 Dec '15

08 Dec '15

h.b.furuseth(a)usit.uio.no wrote: > Full_Name: Hallvard B Furuseth > Version: LMDB 0.9.17 > OS: Linux x86_64 > URL: > Submission from: (NULL) (129.240.203.186) > Submitted by: hallvard > > > $ mtest_rand -c0 -i10000 -p0x100 -r562822527.3 -w > // Options for replay: [-v] -c0 -i10000 -p0x100 -r562822527.3 -w > ../mdb.c:5276: Assertion 'NUMKEYS(mp) > 1' failed in mdb_page_search_root() > Aborte%2(core dumped) > > Broken by 4b01cb3 "ITS#8221 don't merge branch pages needlessly" > according to git bisect. The assert occurs during txn_commit while updating the freeDB. During rebalance, a branch page in the freeDB has been reduced to only 1 key. This page is operated on by another (recursive) rebalance. During page_touch, a new page is needed, which calls page_alloc, which needs to acquire a free page from the freeDB. The resulting search trips this assert because it walks down thru the branch page that is currently being rebalanced. We could simply remove the assert; if we let things progress then eventually the rebalance will succeed and the branch page will be correct. We could also conditionalize the assert so that it ignores the freeDB. Or we can just ignore the problem entirely, because it only occurs on tiny 256 byte pages. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

(ITS#8336) assert(NUMKEYS(mp) > 1) in mdb_page_search_root()
by h.b.furuseth＠usit.uio.no 08 Dec '15

08 Dec '15

Full_Name: Hallvard B Furuseth Version: LMDB 0.9.17 OS: Linux x86_64 URL: Submission from: (NULL) (129.240.203.186) Submitted by: hallvard $ mtest_rand -c0 -i10000 -p0x100 -r562822527.3 -w // Options for replay: [-v] -c0 -i10000 -p0x100 -r562822527.3 -w ../mdb.c:5276: Assertion 'NUMKEYS(mp) > 1' failed in mdb_page_search_root() Aborte%2(core dumped) Broken by 4b01cb3 "ITS#8221 don't merge branch pages needlessly" according to git bisect.

1 0

(ITS#8335) MDB_MULTIPLE issues
by h.b.furuseth＠usit.uio.no 07 Dec '15

07 Dec '15

Full_Name: Hallvard B Furuseth Version: LMDB_0.9.17 OS: Linux x86_64 URL: Submission from: (NULL) (2001:700:100:202::105) Submitted by: hallvard Put(0 data items, MDB_MULTIPLE) stores 1 item. The doc does not warn against 0 items. I suggest supporting 0 items, it is a commonly supported convenience elsewhere (e.g. memcpy). Why does MDB_MULTIPLE require a cursor? mdb_put() rejects it.

1 0

Re: (ITS#8204) rfc2782 shuffle implementation doesn't treat equal-weight records equally
by Sergio.Gelato＠astro.su.se 06 Dec '15

06 Dec '15

--tThc/1wpZn/ma/RB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sorry for the delay in submitting the patch. I wanted to double-check that no third party would lay a credible claim to it. For good measure, I have split the patch in two: the first only addresses the primary issue, and is obviously too simple to be copyrightable. The second addresses the need for falling back to straight Fisher-Yates in the middle of the shuffle, and may or may not be copyrightable so I'll say this: The attached patch files are derived from OpenLDAP Software. All of the modifications to OpenLDAP Software represented therein were developed by me, Sergio Gelato. I have not assigned rights and/or interest in this work to any party. The modifications are subject to the following notice: Copyright 2015 Sergio Gelato Redistribution and use in source and binary forms, with or without modification, are permitted according to the terms of the OpenLDAP Public License. --tThc/1wpZn/ma/RB Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-Remove-bias-towards-the-first-record-in-RFC2782-shuf.patch" >From adb64c957308e5aee08a2f8aa893992a262d3243 Mon Sep 17 00:00:00 2001 From: Sergio Gelato <Sergio.Gelato(a)astro.su.se> Date: Sun, 6 Dec 2015 12:57:46 +0100 Subject: [PATCH 1/2] Remove bias towards the first record in RFC2782 shuffle implementation. Prior to this change, given two records of weight 1 the algorithm would return them in the order (0,1) with 100% probability instead of the desired 50%. This was due to an off-by-one error in the range test. srv_rand() returns a float in the range [0.0, 1.0[, so r is an integer in the range [0, total[. The correct probability for record 0 to be chosen is a[0].weight/total, not (a[0].weight+1)/total. --- libraries/libldap/dnssrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/libldap/dnssrv.c b/libraries/libldap/dnssrv.c index da89b4a..8d30552 100644 --- a/libraries/libldap/dnssrv.c +++ b/libraries/libldap/dnssrv.c @@ -234,7 +234,7 @@ static void srv_shuffle(srv_record *a, int n) { r = srv_rand() * total; for (j=0; j<p; j++) { r -= a[j].weight; - if (r <= 0) { + if (r < 0) { if (j) { srv_record t = a[0]; a[0] = a[j]; -- 2.1.4 --tThc/1wpZn/ma/RB Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0002-Improved-RFC2782-shuffle-when-several-but-not-all-re.patch" >From 6a03d17188964db50a1e8fa4b1a4f24b9db7d33e Mon Sep 17 00:00:00 2001 From: Sergio Gelato <Sergio.Gelato(a)astro.su.se> Date: Sun, 6 Dec 2015 13:33:17 +0100 Subject: [PATCH 2/2] Improved RFC2782 shuffle when several, but not all, records have weight 0. The fallback to a straight Fisher-Yates shuffle needs to occur whenever the sum of the *remaining* weights is zero, or else the remaining records will not be reordered. Testing only once at the beginning covers the case when all weights are zero, and obviously no shuffling is needed when only one weight is zero; but other weight combinations are possible, such as (1, 0, 0). --- libraries/libldap/dnssrv.c | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/libraries/libldap/dnssrv.c b/libraries/libldap/dnssrv.c index 8d30552..63a920c 100644 --- a/libraries/libldap/dnssrv.c +++ b/libraries/libldap/dnssrv.c @@ -216,36 +216,27 @@ static void srv_shuffle(srv_record *a, int n) { for (i=0; i<n; i++) total += a[i].weight; - /* all weights are zero, do a straight Fisher-Yates shuffle */ - if (!total) { - while (n) { - srv_record t; - i = srv_rand() * n--; - t = a[n]; - a[n] = a[i]; - a[i] = t; - } - return; - } - /* Do a shuffle per RFC2782 Page 4 */ - p = n; - for (i=0; i<n-1; i++) { - r = srv_rand() * total; - for (j=0; j<p; j++) { - r -= a[j].weight; - if (r < 0) { - if (j) { - srv_record t = a[0]; - a[0] = a[j]; - a[j] = t; + for (p=n; p>1; a++, p--) { + if (!total) { + /* all remaining weights are zero, + do a straight Fisher-Yates shuffle */ + j = srv_rand() * p; + } else { + r = srv_rand() * total; + for (j=0; j<p; j++) { + r -= a[j].weight; + if (r < 0) { + total -= a[j].weight; + break; } - total -= a[0].weight; - a++; - p--; - break; } } + if (j && j<p) { + srv_record t = a[0]; + a[0] = a[j]; + a[j] = t; + } } } #endif /* HAVE_RES_QUERY */ -- 2.1.4 --tThc/1wpZn/ma/RB--

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

openldap-bugs