Make ACL tests work on Heimdal

Heimdal's KRB5_WELLKNOWN_NAME and related macros expand to a string literal
in parentheses, which means they can't be concatenated by the preprocessor
when the ACL tests are compiled.  Instead, prepare the anonymous principal
name when the tests are run.

Based on a patch by Jeffrey Hutzelman.

1 files changed, 12 insertions, 3 deletions

diff --git a/tests/server/acl-t.c b/tests/server/acl-t.c
index 9b6f347..c448d78 100644
--- a/tests/server/acl-t.c
+++ b/tests/server/acl-t.c
@@ -23,6 +23,7 @@
 #include <server/internal.h>
 #include <tests/tap/basic.h>
 #include <tests/tap/messages.h>
+#include <tests/tap/string.h>
 
 
 /*
@@ -43,15 +44,23 @@ acl_permit(const struct rule *rule, const char *user)
 /*
  * Calls server_config_acl_permit with the anonymous identity and anonymous
  * set to true.
+ *
+ * Heimdal's KRB5_WELLKNOWN_NAME and related constants expand to a literal in
+ * parentheses, which means they cannot be concatenated by the preprocessor
+ * and the string cannot be constructed at compile time.
  */
 static bool
 acl_permit_anonymous(const struct rule *rule)
 {
+    static char *pname = NULL;
     struct client client = {
-        -1, NULL, NULL, 0, NULL,
-        (char *) (KRB5_WELLKNOWN_NAME "/" KRB5_ANON_NAME "@" KRB5_ANON_REALM),
-        true, 0, 0, false, false
+        -1, NULL, NULL, 0, NULL, NULL, true, 0, 0, false, false
     };
+
+    if (pname == NULL)
+        basprintf(&pname, "%s/%s@%s", KRB5_WELLKNOWN_NAME, KRB5_ANON_NAME,
+                  KRB5_ANON_REALM);
+    client.user = pname;
     return server_config_acl_permit(rule, &client);
 }