← Back to branch summary

~nvalcarcel/ubuntu/lucid/puppet/fix-546677

« back to all changes in this revision

Viewing changes to lib/puppet/provider/user/ldap.rb

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-12-23 00:48:10 UTC
  • mfrom: (1.1.10 upstream) (3.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091223004810-3i4oryds922g5n59
Tags: 0.25.1-3ubuntu1
* Merge from debian testing.  Remaining changes:
  - debian/rules:
    + Don't start puppet when first installing puppet.
  - debian/puppet.conf, lib/puppet/defaults.rb:
    + Move templates to /etc/puppet
  - lib/puppet/defaults.rb:
    + Fix /var/lib/puppet/state ownership.
  - man/man8/puppet.conf.8: 
    + Fix broken URL in manpage.
  - debian/control:
    + Update maintainer accordint to spec.
    + Puppetmaster Recommends -> Suggests
    + Created puppet-testsuite as a seperate. Allow the users to run puppet's 
      testsuite.
  - tests/Rakefile: Fix rakefile so that the testsuite can acutally be ran.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/puppet/provider/user/ldap.rb
6
6
        including ``ldapbase``.  You will also almost definitely need settings
7
7
        for ``ldapuser`` and ``ldappassword``, so that your clients can write
8
8
        to ldap.
9
 
        
 
9
 
10
10
        Note that this provider will automatically generate a UID for you if
11
11
        you do not specify one, but it is a potentially expensive operation,
12
12
        as it iterates across all existing users to pick the appropriate next
33
33
 
34
34
    # Find the next uid after the current largest uid.
35
35
    provider = self
36
 
    manager.generates(:uidNumber).with do 
 
36
    manager.generates(:uidNumber).with do
37
37
        largest = 500
38
38
        if existing = provider.manager.search
39
39
            existing.each do |hash|