The branch, master has been updated via 1d1e1da s3:tests: Fix the smblcient utimes test in Europe via 5bfe93b s4:smbd: Add missing unistd.h include to fix build of process_prefork from 42e7671 nwrap: Fix strotoul checks for NSS_WRAPPER_MAX_HOSTENTS
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 1d1e1da263313ce572a1601d9b630188ba643bb4 Author: Andreas Schneider <a...@samba.org> Date: Thu Oct 19 18:03:27 2017 +0200 s3:tests: Fix the smblcient utimes test in Europe Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Fri Oct 20 03:37:31 CEST 2017 on sn-devel-144 commit 5bfe93b4eba48e290b25bd30175d7a36a6a421c5 Author: Andreas Schneider <a...@samba.org> Date: Thu Oct 19 17:27:23 2017 +0200 s4:smbd: Add missing unistd.h include to fix build of process_prefork error: implicit declaration of function ‘getpgrp’; did you mean ‘getpt’? [-Werror=implicit-function-declaration] Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/script/tests/test_smbclient_s3.sh | 18 +++++++++++------- source4/smbd/process_prefork.c | 2 ++ 2 files changed, 13 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh index e402a2c..191f394 100755 --- a/source3/script/tests/test_smbclient_s3.sh +++ b/source3/script/tests/test_smbclient_s3.sh @@ -1442,11 +1442,11 @@ EOF # Now, we should have 2 identical create_time, write_time, change_time # values, but one access_time of Jan 1 05:10:20 AM. - out=`echo "$out" | sort | uniq` - num_create=`echo "$out" | grep 'create_time:' | wc -l` - num_access=`echo "$out" | grep 'access_time:' | wc -l` - num_write=`echo "$out" | grep 'write_time:' | wc -l` - num_change=`echo "$out" | grep 'change_time:' | wc -l` + out_sorted=`echo "$out" | sort | uniq` + num_create=`echo "$out_sorted" | grep -c 'create_time:'` + num_access=`echo "$out_sorted" | grep -c 'access_time:'` + num_write=`echo "$out_sorted" | grep -c 'write_time:'` + num_change=`echo "$out_sorted" | grep -c 'change_time:'` if [ "$num_create" != "1" ]; then echo "failed - should only get one create_time $out" false @@ -1467,11 +1467,15 @@ EOF false return fi - echo "$out" | grep 'access_time:.*Sun Jan.*1 05:10:20 AM 2017' + + # This could be: Sun Jan 1 05:10:20 AM 2017 + # or : Sun Jan 1 05:10:20 2017 CET + echo "$out" | grep 'access_time:.*Sun Jan.*1 05:10:20 .*2017.*' ret=$? if [ $ret -ne 0 ] ; then echo "$out" - echo "failed - should get access_time: Sun Jan 1 05:10:20 AM 2017" + echo + echo "failed - should get access_time: Sun Jan 1 05:10:20 [AM] 2017" false return fi diff --git a/source4/smbd/process_prefork.c b/source4/smbd/process_prefork.c index f2033e9..8e4d624 100644 --- a/source4/smbd/process_prefork.c +++ b/source4/smbd/process_prefork.c @@ -24,6 +24,8 @@ */ #include "includes.h" +#include <unistd.h> + #include "lib/events/events.h" #include "lib/messaging/messaging.h" #include "lib/socket/socket.h" -- Samba Shared Repository