From: Phil Mayers <p.mayers@imperial.ac.uk>
Date: Sat, 6 Oct 2012 12:53:32 +0000 (+0100)
Subject: different numbers of foreach and xlats - use separate loop
X-Git-Tag: release_3_0_0_beta1~1662^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=521ad7b520dd506e07ec2689fa7154882cd0c870;p=thirdparty%2Ffreeradius-server.git

different numbers of foreach and xlats - use separate loop
---

diff --git a/src/main/xlat.c b/src/main/xlat.c
index 68b62ae7a3e..6278e05d75f 100644
--- a/src/main/xlat.c
+++ b/src/main/xlat.c
@@ -757,15 +757,17 @@ int xlat_register(const char *module, RAD_XLAT_FUNC func, void *instance)
 			c = xlat_find(internal_xlat[i]);
 			rad_assert(c != NULL);
 			c->internal = TRUE;
+		}
 
 #ifdef WITH_UNLANG
+		for (i = 0; xlat_foreach_names[i] != NULL; i++) {
 			xlat_register(xlat_foreach_names[i],
 				      xlat_foreach, &xlat_inst[i]);
 			c = xlat_find(xlat_foreach_names[i]);
 			rad_assert(c != NULL);
 			c->internal = TRUE;
-#endif
 		}
+#endif
 
 		/*
 		 *	New name: "control"