From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 27 Feb 2019 00:59:09 +0000 (+0800)
Subject: Merge branch 'master' into v4/xlat-async-strlen
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f55e495bc8e52e367302c053abd749d535aa79cd;p=thirdparty%2Ffreeradius-server.git

Merge branch 'master' into v4/xlat-async-strlen
---

f55e495bc8e52e367302c053abd749d535aa79cd
diff --cc src/lib/server/xlat_func.c
index 65d4035fdcc,3828fd0ec4e..bbde09e6452
--- a/src/lib/server/xlat_func.c
+++ b/src/lib/server/xlat_func.c
@@@ -2715,7 -2701,8 +2722,8 @@@ int xlat_init(void
  	rad_assert(c != NULL);
  	c->internal = true;
  
 +	xlat_async_register(NULL, "strlen", xlat_strlen);
+ 	xlat_async_register(NULL, "module", xlat_module);
 -
  	xlat_async_register(NULL, "base64", base64_xlat);
  	xlat_async_register(NULL, "base64decode", xlat_base64_decode);
  	xlat_async_register(NULL, "bin", bin_xlat);