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

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

aa3928fbf9b4c8a356ef6c0bf0db3376663822db
diff --cc src/lib/server/xlat_func.c
index 3c114bd0346,40183d84eee..f8f400a9100
--- a/src/lib/server/xlat_func.c
+++ b/src/lib/server/xlat_func.c
@@@ -2697,11 -2727,9 +2749,8 @@@ int xlat_init(void
  	c->internal = true
  
  	XLAT_REGISTER(integer);
- 	XLAT_REGISTER(strlen);
- 	XLAT_REGISTER(length);
 -	XLAT_REGISTER(tag);
  	XLAT_REGISTER(xlat);
  	XLAT_REGISTER(map);
- 	XLAT_REGISTER(module);
  	XLAT_REGISTER(debug_attr);
  
  	xlat_register(NULL, "explode", explode_xlat, NULL, NULL, 0, XLAT_DEFAULT_BUF_LEN, true);
@@@ -2715,7 -2743,9 +2764,10 @@@
  	rad_assert(c != NULL);
  	c->internal = true;
  
 +	xlat_async_register(NULL, "tag", xlat_tag);
+ 	xlat_async_register(NULL, "length", xlat_length);
+ 	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);