Merge branch 'rs/maint-config-use-labs' into maint

diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh
index 79045abb5171691246167a42eec6bf18fbeb0b76..f5422f1d33f5eac98e6f56ec4bf05f3f8d4c8be2 100755 (executable)
--- a/t/t1304-default-acl.sh
+++ b/t/t1304-default-acl.sh
@@ -26,7 +26,7 @@ test_expect_success 'checking for a working acl setup' '
 
 if test -z "$LOGNAME"
 then
-       LOGNAME=$USER
+       LOGNAME="${USER:-$(id -u -n)}"
 fi
 
 check_perms_and_acl () {