diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-03-31 20:47:18 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-06-04 03:22:25 +0200 |
| commit | 2b558f2096410b1afd2a6d5bde2862b4cc4fd587 (patch) | |
| tree | ef9aa7154181d1150e89a79c9481173e8c6fe293 /nsswitch | |
| parent | b2c0a6a8510a55899a20ff923ce865f1760e6984 (diff) | |
| download | samba-2b558f2096410b1afd2a6d5bde2862b4cc4fd587.tar.gz samba-2b558f2096410b1afd2a6d5bde2862b4cc4fd587.tar.xz samba-2b558f2096410b1afd2a6d5bde2862b4cc4fd587.zip | |
selftest: Set winbind separator = /
This avoids a pile of shell-script escape pain, and fixes some tests.
Andrew Bartlett
Change-Id: Ie1d0e32ab484a5b0ddbc4073831fe6de27e38e92
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'nsswitch')
| -rwxr-xr-x | nsswitch/tests/test_idmap_rfc2307.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nsswitch/tests/test_idmap_rfc2307.sh b/nsswitch/tests/test_idmap_rfc2307.sh index d3087a171b5..cb60364016e 100755 --- a/nsswitch/tests/test_idmap_rfc2307.sh +++ b/nsswitch/tests/test_idmap_rfc2307.sh @@ -74,24 +74,24 @@ testit "add ldap group mapping record" $VALGRIND $ldbadd -H ldap://$DC_SERVER -U rm -f $PREFIX/tmpldbmodify -testit "wbinfo --name-to-sid" $wbinfo --name-to-sid "$DOMAIN\\$USERNAME" || failed=$(expr $failed + 1) -user_sid=$($wbinfo -n "$DOMAIN\\$USERNAME" | cut -d " " -f1) -echo "$DOMAIN\\$USERNAME resolved to $user_sid" +testit "wbinfo --name-to-sid" $wbinfo --name-to-sid "$DOMAIN/$USERNAME" || failed=$(expr $failed + 1) +user_sid=$($wbinfo -n "$DOMAIN/$USERNAME" | cut -d " " -f1) +echo "$DOMAIN/$USERNAME resolved to $user_sid" testit "wbinfo --sid-to-uid=$user_sid" $wbinfo --sid-to-uid=$user_sid || failed=$(expr $failed + 1) user_uid=$($wbinfo --sid-to-uid=$user_sid | cut -d " " -f1) -echo "$DOMAIN\\$USERNAME resolved to $user_uid" +echo "$DOMAIN/$USERNAME resolved to $user_uid" testit "test $user_uid -eq $USERUID" test $user_uid -eq $USERUID || failed=$(expr $failed + 1) # Not sure how to get group names with spaces to resolve through testit -#testit "wbinfo --name-to-sid" $wbinfo --name-to-sid="$DOMAIN\\$GROUPNAME" || failed=$(expr $failed + 1) -group_sid=$($wbinfo --name-to-sid="$DOMAIN\\$GROUPNAME" | cut -d " " -f1) -echo "$DOMAIN\\$GROUPNAME resolved to $group_sid" +#testit "wbinfo --name-to-sid" $wbinfo --name-to-sid="$DOMAIN/$GROUPNAME" || failed=$(expr $failed + 1) +group_sid=$($wbinfo --name-to-sid="$DOMAIN/$GROUPNAME" | cut -d " " -f1) +echo "$DOMAIN/$GROUPNAME resolved to $group_sid" testit "wbinfo --sid-to-gid=$group_sid" $wbinfo --sid-to-gid=$group_sid || failed=$(expr $failed + 1) group_gid=$($wbinfo --sid-to-gid=$group_sid | cut -d " " -f1) -echo "$DOMAIN\\$GROUPNAME resolved to $group_gid" +echo "$DOMAIN/$GROUPNAME resolved to $group_gid" testit "test $group_gid -eq $GROUPGID" test $group_gid -eq $GROUPGID || failed=$(expr $failed + 1) |