Merge lp://staging/~james-page/ubuntu/maverick/openldap/openldap-fix-658227 into lp://staging/ubuntu/maverick/openldap

Proposed by James Page
Status: Merged
Merge reported by: Mathias Gug
Merged at revision: not available
Proposed branch: lp://staging/~james-page/ubuntu/maverick/openldap/openldap-fix-658227
Merge into: lp://staging/ubuntu/maverick/openldap
Diff against target: 45 lines (+15/-1)
3 files modified
debian/changelog (+7/-0)
debian/slapd.scripts-common (+1/-1)
debian/slapd.templates (+7/-0)
To merge this branch: bzr merge lp://staging/~james-page/ubuntu/maverick/openldap/openldap-fix-658227
Reviewer Review Type Date Requested Status
Mathias Gug Pending
Review via email: mp+38398@code.staging.launchpad.net

Description of the change

Amendments to slapd installation to trigger ldap dump and reload when upgrading to 2.4.23+

Tested by configuring an openldap install on Lucid using the server guide through to populating the ldap database with test data.

As PPA's are disabled automatically by do-release-update, the lucid instance was then updated to point at maverick sources and ppa:james-page/junk was included as an additional source (again using maverick).

slapd was then upgraded and the data within the directory verified using the following command:

 ldapsearch -xLLL -b "dc=example,dc=com" uid=john sn givenName cn

Note that I had to change slapd.templates as the slapd.scripts-common function used to dump databases depended on a missing entry.

To post a comment you must log in.
Revision history for this message
Mathias Gug (mathiaz) wrote :

Uploaded to maverick-proposed.

I've revised the package revision to follow the Ubuntu Security guidelines at https://wiki.ubuntu.com/SecurityTeam/UpdatePreparation#Update%20the%20packaging.

I've modified the package version comparison to include the revision: 2.4.23-0ubuntu3.1.

I've updated the target release to maverick-proposed since maverick is now released. All SRU will be uploaded to maverick-proposed from now on (security updates being uploaded to maverick-security directly).

I've removed the slapd.templates change: it doesn't have a direct impact on the bug and SRU should have a *minimal* working patch.

Revision history for this message
James Page (james-page) wrote :

Points 1,2 and 3 noted for future reference.

Point 4 - removal of slapd.templates change; I originally tested without making this change; however the upgrade failed on line 320 of slapd.scripts-common when db_get slapd/move_old_database was executed. Re-testing with the change to slapd.templates resulted in a successful upgrade.

Revision history for this message
Nathan Stratton Treadway (nathanst) wrote :

For what it's worth, I got the impression that the slapd/move_old_database template was incorrectly removed along with all the many templates related to the automatic creation of the default database (when that functionality was removed from the package).

http://bazaar.launchpad.net/%7Eubuntu-branches/ubuntu/maverick/openldap/maverick/revision/18/debian/slapd.templates#debian/slapd.templates

It hasn't been an issue until now because the code hasn't needed to check the slapd/move_old_database value since 2.4.14 (the last time database_format_changed would return "true").

Nathan

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches