diff options
| -rwxr-xr-x | nsswitch/tests/test_wbinfo.sh | 17 | ||||
| -rwxr-xr-x | selftest/target/Samba3.pm | 1 |
2 files changed, 12 insertions, 6 deletions
diff --git a/nsswitch/tests/test_wbinfo.sh b/nsswitch/tests/test_wbinfo.sh index cfe582df068..f9c040e5f43 100755 --- a/nsswitch/tests/test_wbinfo.sh +++ b/nsswitch/tests/test_wbinfo.sh @@ -205,13 +205,18 @@ subunit_start_test "$test_name" # The full name (GECOS) is based on name (the RDN, in this case CN) # and displayName in winbindd_ads, and is based only on displayName in # winbindd_msrpc and winbindd_rpc. Allow both versions. -expected_line="$DOMAIN/administrator:*:$admin_uid:$gid:Administrator:/home/$DOMAIN/administrator:/bin/false" -expected2_line="$DOMAIN/administrator:*:$admin_uid:$gid::/home/$DOMAIN/administrator:/bin/false" +if test "$TARGET" = "ad_member"; then + expected1_line="$DOMAIN/administrator:*:$admin_uid:$gid:Administrator:/home/$DOMAIN/Domain Users/administrator:/bin/false" + expected2_line="$DOMAIN/administrator:*:$admin_uid:$gid::/home/$DOMAIN/Domain Users/administrator:/bin/false" +else + expected1_line="$DOMAIN/administrator:*:$admin_uid:$gid:Administrator:/home/$DOMAIN/administrator:/bin/false" + expected2_line="$DOMAIN/administrator:*:$admin_uid:$gid::/home/$DOMAIN/administrator:/bin/false" +fi -if test x$passwd_line = x"$expected_line" -o x$passwd_line = x"$expected2_line"; then +if test "x$passwd_line" = "x$expected1_line" -o "x$passwd_line" = "x$expected2_line"; then subunit_pass_test "$test_name" else - echo "expected '$expected_line' or '$expected2_line' got '$passwd_line'" | subunit_fail_test "$test_name" + echo "expected '$expected1_line' or '$expected2_line' got '$passwd_line'" | subunit_fail_test "$test_name" failed=`expr $failed + 1` fi @@ -227,10 +232,10 @@ fi test_name="confirm output of wbinfo --uid-info against $TARGET" subunit_start_test "$test_name" -if test x$passwd_line = x"$expected_line" -o x$passwd_line = x"$expected2_line"; then +if test "x$passwd_line" = "x$expected1_line" -o "x$passwd_line" = "x$expected2_line"; then subunit_pass_test "$test_name" else - echo "expected '$expected_line' or '$expected2_line' got '$passwd_line'" | subunit_fail_test "$test_name" + echo "expected '$expected1_line' or '$expected2_line' got '$passwd_line'" | subunit_fail_test "$test_name" failed=`expr $failed + 1` fi diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index a3ab56c47c1..92031a1eed4 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -412,6 +412,7 @@ sub setup_admember($$$$) workgroup = $dcvars->{DOMAIN} realm = $dcvars->{REALM} netbios aliases = foo bar + template homedir = /home/%D/%G/%U [sub_dug] path = $share_dir/D_%D/U_%U/G_%G |