Add support for "default" entries in a switch statement

diff --git a/man/man5/unlang.5 b/man/man5/unlang.5
index 7248542..5983553 100644 (file)
--- a/man/man5/unlang.5
+++ b/man/man5/unlang.5
@@ -75,6 +75,18 @@ statement cannot appear outside of a "switch" block.
 .br
        }
 .DE
+
+A "default" entry can be defined by not specifying a static string.
+This entry will be used if no other "case" entry matches.  Only one
+"default" entry can exist in a "switch" section.
+
+.DS
+       case {
+.br
+               ...
+.br
+       }
+.DE
 .IP update
 .br
 Update a particular attribute list, based on the attributes given in
@@ -96,8 +108,9 @@ attributes maintainted internally by the server that controls how the
 server processes the request.  Any attribute that does not go in a
 packet on the network will generally be placed in the "control" list.
 
-For a detailed description of the contents of the "update" section,
-see the ATTRIBUTES section below.
+The only contents permitted in an "update" section are attributes and
+values.  For a detailed description of the contents of the "update"
+section, see the ATTRIBUTES section below.
 .SH CONDITIONS
 The conditions are similar to C conditions in syntax, though
 quoted strings are supported, as with the Unix shell.

diff --git a/src/main/modcall.c b/src/main/modcall.c
index 4368b2a..4a45ec3 100644 (file)
--- a/src/main/modcall.c
+++ b/src/main/modcall.c
@@ -402,7 +402,7 @@ int modcall(int component, modcallable *c, REQUEST *request)
                 */
                if (child->type != MOD_SINGLE) {
                        int count = 1;
-                       modcallable *p, *q;
+                       modcallable *p, *q, *null_case;
                        modgroup *g = mod_callabletogroup(child);
 
                        stack.pointer++;
@@ -464,13 +464,20 @@ int modcall(int component, modcallable *c, REQUEST *request)
                                radius_xlat(buffer, sizeof(buffer),
                                            child->name, request, NULL);
 
-                               q = NULL;
+                               null_case = q = NULL;
                                for(p = g->children; p; p = p->next) {
+                                       if (!p->name) {
+                                               if (!null_case) null_case = p;
+                                               continue;
+                                       }
                                        if (strcmp(buffer, p->name) == 0) {
                                                q = p;
                                                break;
                                        }
                                }
+
+                               if (!q) q = null_case;
+
                                stack.children[stack.pointer] = q;
                                break;
 
@@ -485,7 +492,8 @@ int modcall(int component, modcallable *c, REQUEST *request)
 
                        DEBUG2("%.*s- entering %s %s",
                               stack.pointer, modcall_spaces,
-                              group_name[child->type], child->name);
+                              group_name[child->type],
+                              child->name ? child->name : "");
 
                        /*
                         *      Catch the special case of a NULL group.
@@ -522,7 +530,7 @@ int modcall(int component, modcallable *c, REQUEST *request)
        handle_result:
                DEBUG2("%.*s[%s] returns %s",
                       stack.pointer + 1, modcall_spaces,
-                      child->name,
+                      child->name ? child->name : "",
                       lrad_int2str(rcode_table, myresult, "??"));
 
 
@@ -640,7 +648,8 @@ int modcall(int component, modcallable *c, REQUEST *request)
 
                        DEBUG2("%.*s- %s %s returns %s",
                               stack.pointer + 1, modcall_spaces,
-                              group_name[parent->type], parent->name,
+                              group_name[parent->type],
+                              parent->name ? parent->name : "",
                               lrad_int2str(rcode_table, myresult, "??"));
 
                        if ((parent->type == MOD_IF) ||
@@ -1148,8 +1157,9 @@ static modcallable *do_compile_modswitch(modcallable *parent,
                                         int component, CONF_SECTION *cs,
                                         const char *filename, int lineno)
 {
-               modcallable *csingle;
+       modcallable *csingle;
        CONF_ITEM *ci;
+       int had_seen_default = FALSE;
 
        component = component;  /* -Wunused */
 
@@ -1190,7 +1200,12 @@ static modcallable *do_compile_modswitch(modcallable *parent,
                }
 
                name2 = cf_section_name2(subcs);
-               if (!name2) {
+               if (!name2 && !had_seen_default) {
+                       had_seen_default = TRUE;
+                       continue;
+               }
+
+               if (!name2 || (name2[0] == '\0')) {
                        radlog(L_ERR|L_CONS,
                               "%s[%d]: \"case\" sections must have a name",
                               filename,
@@ -1402,6 +1417,7 @@ static modcallable *do_compile_modsingle(modcallable *parent,
                                                     grouptype);
                        if (!csingle) return NULL;
                        csingle->type = MOD_CASE;
+                       csingle->name = cf_section_name2(cs); /* may be NULL */
 
                        /*
                         *      Set all of it's codes to return, so that