lib/puppet/provider/nameservice.rb in puppet-0.24.9 vs lib/puppet/provider/nameservice.rb in puppet-0.25.0

- old
+ new

@@ -126,13 +126,13 @@ def op(property) @ops[property.name] || ("-" + property.name) end end - + # Autogenerate a value. Mostly used for uid/gid, but also used heavily - # with netinfo, because netinfo is stupid. + # with DirectoryServices, because DirectoryServices is stupid. def autogen(field) field = symbolize(field) id_generators = {:user => :uid, :group => :gid} if id_generators[@resource.class.name] == field return autogen_id(field) @@ -152,16 +152,16 @@ def autogen_id(field) highest = 0 group = method = nil case @resource.class.name - when :user: group = :passwd; method = :uid - when :group: group = :group; method = :gid + when :user; group = :passwd; method = :uid + when :group; group = :group; method = :gid else raise Puppet::DevError, "Invalid resource name %s" % resource end - + # Make sure we don't use the same value multiple times if defined? @@prevauto @@prevauto += 1 else Etc.send(group) { |obj| @@ -242,10 +242,10 @@ @objectinfo = Etc.send(@etcmethod, @resource[:name]) rescue ArgumentError => detail @objectinfo = nil end end - + # Now convert our Etc struct into a hash. if @objectinfo return info2hash(@objectinfo) else return nil