From bb07619ac9d484899c91e051be39ab33f5d4b27f Mon Sep 17 00:00:00 2001 From: Thom May Date: Wed, 2 Mar 2016 16:46:43 +0000 Subject: Revert "Merge pull request #4465 from artursitarski/change-shell-for-locked-user" This reverts commit 94494e761763b877c3ef3b52eee9ac9df2186340, reversing changes made to a95a87d50c9e5af2fbd583afcf972880656d1a4b. --- lib/chef/provider/user/useradd.rb | 4 ++-- spec/functional/resource/user/useradd_spec.rb | 3 --- spec/support/shared/unit/provider/useradd_based_user_provider.rb | 8 ++++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/chef/provider/user/useradd.rb b/lib/chef/provider/user/useradd.rb index 8f41ca3f5d..e2f5b5897a 100644 --- a/lib/chef/provider/user/useradd.rb +++ b/lib/chef/provider/user/useradd.rb @@ -93,11 +93,11 @@ class Chef end def lock_user - shell_out!("usermod", "-L", "-s", "/bin/false", new_resource.username) + shell_out!("usermod", "-L", new_resource.username) end def unlock_user - shell_out!("usermod", "-U", "-s", new_resource.shell, new_resource.username) + shell_out!("usermod", "-U", new_resource.username) end def compile_command(base_command) diff --git a/spec/functional/resource/user/useradd_spec.rb b/spec/functional/resource/user/useradd_spec.rb index 6ac855fbfc..5ce3ed7354 100644 --- a/spec/functional/resource/user/useradd_spec.rb +++ b/spec/functional/resource/user/useradd_spec.rb @@ -144,7 +144,6 @@ describe Chef::Provider::User::Useradd, metadata do let(:password) { nil } let(:system) { false } let(:comment) { nil } - let(:shell) { nil } let(:user_resource) do r = Chef::Resource::User.new("TEST USER RESOURCE", run_context) @@ -155,7 +154,6 @@ describe Chef::Provider::User::Useradd, metadata do r.manage_home(manage_home) r.password(password) r.system(system) - r.shell(shell) r end @@ -620,7 +618,6 @@ describe Chef::Provider::User::Useradd, metadata do context "when the user exists" do include_context "user exists for lock/unlock" - let(:shell) { "/bin/sh" } before do begin diff --git a/spec/support/shared/unit/provider/useradd_based_user_provider.rb b/spec/support/shared/unit/provider/useradd_based_user_provider.rb index b792c43fd7..6677a069ea 100644 --- a/spec/support/shared/unit/provider/useradd_based_user_provider.rb +++ b/spec/support/shared/unit/provider/useradd_based_user_provider.rb @@ -365,15 +365,15 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option end describe "when locking the user" do - it "should run usermod -L -s /bin/false with the new resources username" do - expect(provider).to receive(:shell_out!).with("usermod", "-L", "-s", "/bin/false", @new_resource.username) + it "should run usermod -L with the new resources username" do + expect(provider).to receive(:shell_out!).with("usermod", "-L", @new_resource.username) provider.lock_user end end describe "when unlocking the user" do - it "should run usermod -U -s with the new resources shell and username" do - expect(provider).to receive(:shell_out!).with("usermod", "-U", "-s", @new_resource.shell, @new_resource.username) + it "should run usermod -L with the new resources username" do + expect(provider).to receive(:shell_out!).with("usermod", "-U", @new_resource.username) provider.unlock_user end end -- cgit v1.2.1