From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 30 Jun 2016 00:10:25 +0000 (-0400)
Subject: Do pass2 compilation on conditions.  Fixes #1632
X-Git-Tag: release_3_0_12~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f982311f75b704c3ed1581c4fca69dd0ae7fd82d;p=thirdparty%2Ffreeradius-server.git

Do pass2 compilation on conditions.  Fixes #1632
---

diff --git a/src/include/modcall.h b/src/include/modcall.h
index ac927776482..7486ef168b5 100644
--- a/src/include/modcall.h
+++ b/src/include/modcall.h
@@ -46,6 +46,8 @@ void add_to_modcallable(modcallable *parent, modcallable *this);
 
 void modcall_debug(modcallable *mc, int depth);
 
+int modcall_pass2_condition(fr_cond_t *c);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/main/command.c b/src/main/command.c
index 3e04539dcbe..d3b729f9a5a 100644
--- a/src/main/command.c
+++ b/src/main/command.c
@@ -24,6 +24,7 @@
 #ifdef WITH_COMMAND_SOCKET
 
 #include <freeradius-devel/parser.h>
+#include <freeradius-devel/modcall.h>
 #include <freeradius-devel/md5.h>
 #include <freeradius-devel/channel.h>
 
@@ -1350,6 +1351,8 @@ static int command_debug_condition(rad_listen_t *listener, int argc, char *argv[
 		return CMD_FAIL;
 	}
 
+	(void) modcall_pass2_condition(new_condition);
+
 	/*
 	 *	Delete old condition.
 	 *
diff --git a/src/main/modcall.c b/src/main/modcall.c
index 5b4b99ab2ee..af74b94e5a4 100644
--- a/src/main/modcall.c
+++ b/src/main/modcall.c
@@ -4008,3 +4008,10 @@ void modcall_debug(modcallable *mc, int depth)
 		}
 	}
 }
+
+int modcall_pass2_condition(fr_cond_t *c)
+{
+	if (!fr_condition_walk(c, pass2_callback, NULL)) return -1;
+
+	return 0;
+}