Spotlight: "spotlight expr = false" broke the default Spotlight query

[netatalk.git] / etc / spotlight / slmod_sparql_parser.y

diff --git a/etc/spotlight/slmod_sparql_parser.y b/etc/spotlight/slmod_sparql_parser.y
index e4069bbe381892be8a67f2d877f9400f4ecd6796..76d8b5a768d5b668c72f093b1adf1ebfb3f8dda9 100644 (file)
--- a/etc/spotlight/slmod_sparql_parser.y
+++ b/etc/spotlight/slmod_sparql_parser.y
@@ -92,8 +92,6 @@ BOOL                             {
         YYABORT;
 }
 | match OR match                 {
-    if (!ssp_slq->slq_allow_expr)
-        YYABORT;
     if ($1 == NULL || $3 == NULL)
         YYABORT;
     if (strcmp($1, $3) != 0)
@@ -105,11 +103,17 @@ BOOL                             {
 | function                     {$$ = $1;}
 | OBRACE expr CBRACE           {$$ = talloc_asprintf(ssp_slq, "%s", $2);}
 | expr AND expr                {
-    if (!ssp_slq->slq_allow_expr)
+    if (!ssp_slq->slq_allow_expr) {
+        yyerror("Spotlight queries with logic expressions are disabled");
         YYABORT;
+    }
     $$ = talloc_asprintf(ssp_slq, "%s . %s", $1, $3);
 }
 | expr OR expr                 {
+    if (!ssp_slq->slq_allow_expr) {
+        yyerror("Spotlight queries with logic expressions are disabled");
+        YYABORT;
+    }
     if (strcmp($1, $3) != 0)
         $$ = talloc_asprintf(ssp_slq, "{ %s } UNION { %s }", $1, $3);
     else