From f2fd0d1ec854542ee0b1284bccaf698f9ad69b81 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Tue, 16 Nov 2010 10:11:55 -0800 Subject: Fix for #5273 -- user resource constantly resetting password age The query methods for the newly added password age properties didn't have the same name as the properties, and thus the default retrieve method wan't finding them and never got the current value from the provider. They were therefore always seen as :absent and puppet always thought they needed to be set. --- lib/puppet/provider/user/user_role_add.rb | 4 ++-- lib/puppet/provider/user/useradd.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/puppet/provider/user/user_role_add.rb b/lib/puppet/provider/user/user_role_add.rb index caca1ef88..2377f9e65 100644 --- a/lib/puppet/provider/user/user_role_add.rb +++ b/lib/puppet/provider/user/user_role_add.rb @@ -156,11 +156,11 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source => shadow_entry[1] if shadow_entry end - def min_age + def password_min_age shadow_entry ? shadow_entry[3] : :absent end - def max_age + def password_max_age shadow_entry ? shadow_entry[4] : :absent end diff --git a/lib/puppet/provider/user/useradd.rb b/lib/puppet/provider/user/useradd.rb index 5a163f35a..ba406cc63 100644 --- a/lib/puppet/provider/user/useradd.rb +++ b/lib/puppet/provider/user/useradd.rb @@ -78,7 +78,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ end end - def min_age + def password_min_age if Puppet.features.libshadow? if ent = Shadow::Passwd.getspnam(@resource.name) return ent.sp_min @@ -87,7 +87,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ :absent end - def max_age + def password_max_age if Puppet.features.libshadow? if ent = Shadow::Passwd.getspnam(@resource.name) return ent.sp_max -- cgit