diff options
| author | Ralph Boehme <slow@samba.org> | 2017-03-31 16:06:18 +0200 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2017-04-06 20:08:19 +0200 |
| commit | d8fd56a8244a3010469c27eaa3b73a2c5fbbc41f (patch) | |
| tree | 4d90363d1f1d44a8d15a13d43a662306706474c8 /nsswitch | |
| parent | 167bb5ead8c7193d173fdba8a453279d422fa7ea (diff) | |
| download | samba-d8fd56a8244a3010469c27eaa3b73a2c5fbbc41f.tar.gz | |
selftest: fix for wbinfo -s tests for wellknown SIDs
Rework while loop to not use a pipe as that uses a subshell for the loop
which means assigning to the variable failed is not visible in the
main script.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12727
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'nsswitch')
| -rwxr-xr-x | nsswitch/tests/test_wbinfo.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/nsswitch/tests/test_wbinfo.sh b/nsswitch/tests/test_wbinfo.sh index d298ddb947e..49296b6897e 100755 --- a/nsswitch/tests/test_wbinfo.sh +++ b/nsswitch/tests/test_wbinfo.sh @@ -88,9 +88,7 @@ else echo "success: wbinfo -s check for sane mapping" fi -WELL_KNOWN_SIDS="S-1-1-0\n /EVERYONE 5\n S-1-3-1\n /CREATOR GROUP 5\n S-1-5-1\n NT AUTHORITY/DIALUP 5" - -printf "$WELL_KNOWN_SIDS" | while read SID ; do +while read SID ; do read NAME testit "wbinfo -s $SID against $TARGET" $wbinfo -s $SID || failed=`expr $failed + 1` @@ -106,7 +104,14 @@ printf "$WELL_KNOWN_SIDS" | while read SID ; do else echo "success: wbinfo -s $SID against $TARGET" fi -done +done <<EOF +S-1-1-0 +/EVERYONE 5 +S-1-3-1 +/CREATOR GROUP 5 +S-1-5-1 +NT AUTHORITY/DIALUP 5 +EOF testit "wbinfo -n on the returned name against $TARGET" $wbinfo -n $admin_name || failed=`expr $failed + 1` test_sid=`$wbinfo -n $tested_name | cut -d " " -f1` |