Attachment 127283 Details for Bug 98191 – Trivial config parser: enumerate the elements we don't care about

[patch] Trivial config parser: enumerate the elements we don't care about

0003-Trivial-config-parser-enumerate-the-elements-we-don-.patch (text/plain), 2.83 KB, created by Simon McVittie on 2016-10-13 22:23:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2016-10-13 22:23:31 UTC

Size: 2.83 KB

patch

obsolete

>From c8c5f678777d741d01765b90eb7c20d0389577d3 Mon Sep 17 00:00:00 2001
>From: Thomas Zimmermann <tdz@users.sourceforge.net>
>Date: Thu, 13 Oct 2016 23:16:33 +0100
>Subject: [PATCH 3/6] Trivial config parser: enumerate the elements we don't
> care about
>
>This quiets -Wswitch-enum warnings. The trivial config parser
>is used by the setuid activation helper, and only handles the
>elements whose contents influence the operation of that helper:
>system service directories, the setuid activation helper itself,
>the bus uid, and the bus type.
>
>[smcv: split out from a larger commit; add justification; move
>ELEMENT_SERVICEDIR start handler to a functionally equivalent list
>of elements whose content we are going to process later]
>Reviewed-by: Simon McVittie <smcv@debian.org>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98191
>---
> bus/config-parser-trivial.c | 43 +++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 43 insertions(+)
>
>diff --git a/bus/config-parser-trivial.c b/bus/config-parser-trivial.c
>index 129431d..d085fe7 100644
>--- a/bus/config-parser-trivial.c
>+++ b/bus/config-parser-trivial.c
>@@ -162,6 +162,7 @@ bus_config_parser_start_element (BusConfigParser   *parser,
> 
>   switch (parser->type)
>     {
>+    case ELEMENT_SERVICEDIR:
>     case ELEMENT_SERVICEHELPER:
>     case ELEMENT_USER:
>     case ELEMENT_CONFIGTYPE:
>@@ -185,6 +186,26 @@ bus_config_parser_start_element (BusConfigParser   *parser,
>         break;
>       }
> 
>+    case ELEMENT_NONE:
>+    case ELEMENT_BUSCONFIG:
>+    case ELEMENT_INCLUDE:
>+    case ELEMENT_LISTEN:
>+    case ELEMENT_AUTH:
>+    case ELEMENT_POLICY:
>+    case ELEMENT_LIMIT:
>+    case ELEMENT_ALLOW:
>+    case ELEMENT_DENY:
>+    case ELEMENT_FORK:
>+    case ELEMENT_PIDFILE:
>+    case ELEMENT_INCLUDEDIR:
>+    case ELEMENT_SELINUX:
>+    case ELEMENT_ASSOCIATE:
>+    case ELEMENT_STANDARD_SESSION_SERVICEDIRS:
>+    case ELEMENT_KEEP_UMASK:
>+    case ELEMENT_SYSLOG:
>+    case ELEMENT_ALLOW_ANONYMOUS:
>+    case ELEMENT_APPARMOR:
>+      /* fall through */
>     default:
>       {
>         /* we really don't care about the others... */
>@@ -286,6 +307,28 @@ bus_config_parser_content (BusConfigParser   *parser,
>           }
>       }
>       break;
>+
>+    case ELEMENT_NONE:
>+    case ELEMENT_BUSCONFIG:
>+    case ELEMENT_INCLUDE:
>+    case ELEMENT_LISTEN:
>+    case ELEMENT_AUTH:
>+    case ELEMENT_POLICY:
>+    case ELEMENT_LIMIT:
>+    case ELEMENT_ALLOW:
>+    case ELEMENT_DENY:
>+    case ELEMENT_FORK:
>+    case ELEMENT_PIDFILE:
>+    case ELEMENT_INCLUDEDIR:
>+    case ELEMENT_SELINUX:
>+    case ELEMENT_ASSOCIATE:
>+    case ELEMENT_STANDARD_SESSION_SERVICEDIRS:
>+    case ELEMENT_STANDARD_SYSTEM_SERVICEDIRS:
>+    case ELEMENT_KEEP_UMASK:
>+    case ELEMENT_SYSLOG:
>+    case ELEMENT_ALLOW_ANONYMOUS:
>+    case ELEMENT_APPARMOR:
>+      /* fall through */
>     default:
>       {
>         /* we don't care about the others... really */
>-- 
>2.9.3
>

Actions: View | Splinter Review

Attachments on bug 98191: 127281 | 127282 | 127283 | 127284 | 127285 | 127286 | 129005 | 130424 | 130425 | 130426 | 130427 | 130428 | 130429 | 130430 | 130431 | 130432 | 130433 | 130434 | 130435 | 130436 | 130437 | 130438 | 130439 | 130442 | 130743

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.