Merge branch 'master' into transp_logging_1031

Conflicts:
	src/src/expand.c

diff --git a/src/src/expand.c b/src/src/expand.c
index ac914707ad1e2a18dc5d22671e9c25bf2f936796..1674c5fb57f9252caea2aaaff144e814d1c737e6 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -1908,8 +1908,8 @@ while (i < nsub)
 DEBUG(D_expand)
   debug_printf("expanding: acl: %s  arg: %s%s\n",
     sub[0],
-    acl_narg>0 ? acl_arg[0]   : US"<none>",
-    acl_narg>1 ? " +more" : "");
+    acl_narg>0 ? acl_arg[0] : US"<none>",
+    acl_narg>1 ? " +more"   : "");
 
 ret = acl_eval(acl_where, sub[0], user_msgp, &tmp);