Re: [Audit-test-developer] [PATCH] Fix nonexistent faillock on SUSE

[Jiri J. <jja...@re...>]

On 04/06/2015 06:37 PM, Linda Knippers wrote:
> This looks ok to me.  Miroslav, Jiri, any concern?

Seems fine to me.

> 
> -- ljk
> 
> On 4/2/2015 11:37 AM, Cyril Hrubis wrote:
>> Fixes harmless error messages caused by:
>>
>> commit 744c093b6f538ac608962a752d8776341cc13174
>> Author: Jiri Jaburek <jja...@re...>
>> Date:   Mon Dec 10 14:20:04 2012 +0100
>>
>> 	utils: make sure testuser/testadmin is not faillocked
>>
>> Signed-off-by: Cyril Hrubis <ch...@su...>
>> ---
>>  audit-test/utils/run.bash | 8 ++++++--
>>  1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/audit-test/utils/run.bash b/audit-test/utils/run.bash
>> index c3a709f..a1d99ff 100755
>> --- a/audit-test/utils/run.bash
>> +++ b/audit-test/utils/run.bash
>> @@ -271,7 +271,9 @@ function startup {
>>      dmsg "Adding user $TEST_USER"
>>      useradd -g "$TEST_USER" -G wheel -m "$TEST_USER" || die
>>      echo "$TEST_USER_PASSWD" | passwd --stdin $TEST_USER >/dev/null
>> -    faillock --user "$TEST_USER" --reset
>> +    if which faillock 2>&1 >/dev/null; then
>> +        faillock --user "$TEST_USER" --reset
>> +    fi
>>  
>>      # Add the test user which is in sysadm_r
>>      killall -9 -u "$TEST_ADMIN" &>/dev/null
>> @@ -286,7 +288,9 @@ function startup {
>>          useradd -g "$TEST_ADMIN" -G wheel -m "$TEST_ADMIN" || die
>>      fi
>>      echo "$TEST_ADMIN_PASSWD" | passwd --stdin $TEST_ADMIN >/dev/null
>> -    faillock --user "$TEST_ADMIN" --reset
>> +    if which faillock 2>&1 >/dev/null; then
>> +        faillock --user "$TEST_ADMIN" --reset
>> +    fi
>>  
>>      startup_hook
>>  }
>>
> 
> 
> ------------------------------------------------------------------------------
> BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
> Develop your own process in accordance with the BPMN 2 standard
> Learn Process modeling best practices with Bonita BPM through live exercises
> http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
> source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
> _______________________________________________
> Audit-test-developer mailing list
> Aud...@li...
> https://lists.sourceforge.net/lists/listinfo/audit-test-developer
>