[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  77be963 nsswitch: Use a swtich in the wbinfo test to lookup users
      from  a30ac85 ctdb-tests: Avoid segfault by initializing logging

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 77be96379bcef56ea580010f1d60fe54e5647ff4
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Jul 6 14:07:37 2018 +0200

    nsswitch: Use a swtich in the wbinfo test to lookup users
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13503
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Fri Jul  6 17:14:44 CEST 2018 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 nsswitch/tests/test_wbinfo_user_info.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/tests/test_wbinfo_user_info.sh b/nsswitch/tests/test_wbinfo_user_info.sh
index da30f97..8158ead 100755
--- a/nsswitch/tests/test_wbinfo_user_info.sh
+++ b/nsswitch/tests/test_wbinfo_user_info.sh
@@ -118,18 +118,21 @@ testit "getpwnam.domain.$DOMAIN.$USERNAME1" test_getpwnam "$DOMAIN/$USERNAME1" 0
 
 testit "getpwnam.upn.$UPN_NAME1" test_getpwnam "$UPN1" 0 "$DOMAIN/$USERNAME1" || failed=$(expr $failed + 1)
 
-# We should not be able to lookup the user just by the name
-test_ret=0
-test_output="$DOMAIN/$USERNAME1"
-
-if [ "$ENVNAME" = "ad_member" ]; then
+case ${ENVNAME} in
+	ad_member*)
+	# We should not be able to lookup the user just by the name
 	test_ret=2
 	test_output=""
-fi
-if [ "$ENVNAME" = "fl2008r2dc" ]; then
+	;;
+	fl2008r2dc*)
 	test_ret=0
 	test_output="$OWN_DOMAIN/$USERNAME1"
-fi
+	;;
+	*)
+	test_ret=0
+	test_output="$DOMAIN/$USERNAME1"
+	;;
+esac
 
 testit "getpwnam.local.$USERNAME1" test_getpwnam "$USERNAME1" $test_ret $test_output || failed=$(expr $failed + 1)
 


-- 
Samba Shared Repository