From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 26 Jul 2018 18:50:46 +0000 (-0400)
Subject: Revert "move to enum"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c41d95299d4fa5248efed53de60bc936ee03dc6e;p=thirdparty%2Ffreeradius-server.git

Revert "move to enum"

This reverts commit 9571b9adc846f5174b6215faf76ccf6999f88b99.

easier on the coder, but the compiler complains
---

diff --git a/src/lib/server/command.c b/src/lib/server/command.c
index d08e9929a35..afaf66bdfa1 100644
--- a/src/lib/server/command.c
+++ b/src/lib/server/command.c
@@ -72,16 +72,17 @@ static bool fr_command_valid_name(char const *name);
 static int split(char **input, char **output, bool syntax_string);
 
 /*
- *	Hacks for simplicity.  Non-data types aren't allowed as
+ *	Hacks for simplicity.  These data types aren't allowed as
  *	parameters, so we can re-use them for something else.
  */
-enum {
-	FR_TYPE_FIXED = FR_TYPE_ABINARY,
-	FR_TYPE_VARARGS,
-	FR_TYPE_OPTIONAL,
-	FR_TYPE_ALTERNATE,
-	FR_TYPE_ALTERNATE_CHOICE,
-};
+
+// our fixed string.  Any data type LESS than this must be a real data type
+#define FR_TYPE_FIXED		FR_TYPE_ABINARY
+
+#define FR_TYPE_VARARGS		FR_TYPE_TLV
+#define FR_TYPE_OPTIONAL	FR_TYPE_STRUCT
+#define FR_TYPE_ALTERNATE	FR_TYPE_EXTENDED
+#define FR_TYPE_ALTERNATE_CHOICE FR_TYPE_LONG_EXTENDED
 
 /** Find a command
  *