Allow empty strings in "case" statements. Closes #836

diff --git a/src/main/conffile.c b/src/main/conffile.c
index 2a0c3ba..04c28a0 100644 (file)
--- a/src/main/conffile.c
+++ b/src/main/conffile.c
@@ -365,7 +365,7 @@ CONF_SECTION *cf_section_alloc(CONF_SECTION *parent, char const *name1,
                return NULL;
        }
 
-       if (name2 && *name2) {
+       if (name2) {
                cs->name2 = talloc_typed_strdup(cs, name2);
                if (!cs->name2) goto error;
        }

diff --git a/src/main/modcall.c b/src/main/modcall.c
index eed1614..3e428c3 100644 (file)
--- a/src/main/modcall.c
+++ b/src/main/modcall.c
@@ -1943,13 +1943,13 @@ static modcallable *do_compile_modswitch (modcallable *parent, rlm_components_t
                }
 
                name2 = cf_section_name2(subcs);
-               if (!name2 && !had_seen_default) {
-                       had_seen_default = true;
-                       continue;
-               }
+               if (!name2) {
+                       if (!had_seen_default) {
+                               had_seen_default = true;
+                               continue;
+                       }
 
-               if (!name2 || (name2[0] == '\0')) {
-                       cf_log_err(ci, "\"case\" sections must have a name");
+                       cf_log_err(ci, "Cannot have two 'default' case statements");
                        talloc_free(vpt);
                        return NULL;
                }

diff --git a/src/tests/keywords/case-empty-string b/src/tests/keywords/case-empty-string
new file mode 100644 (file)
index 0000000..4b8e7cd
--- /dev/null
+++ b/src/tests/keywords/case-empty-string
@@ -0,0 +1,25 @@
+# PRE: switch
+#
+update request {
+       Filter-Id := ""
+}
+
+switch &Filter-Id {
+       case "" {
+               update reply {
+                       Filter-Id := "filter"
+               }
+       }
+
+       case "doug" {
+               update reply {
+                       Filter-Id := "doug"
+               }
+       }
+
+       case {
+               update reply {
+                       Filter-Id := "default"
+               }
+       }
+}