discover/discover-server: Restrict clients based on uid
[petitboot] / discover / yaboot-parser.c
index f16ac723ff4b7a7f672616d9bd7c96efd9eadb1a..b06248f535f35eb0c05b3e2bf2437a1516cafbdf 100644 (file)
@@ -1,9 +1,12 @@
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <i18n/i18n.h>
 
 #include "log/log.h"
 #include "talloc/talloc.h"
@@ -14,7 +17,6 @@
 
 struct yaboot_state {
        int globals_done;
-       const char *const *known_names;
 
        /* current option data */
        struct discover_boot_option *opt;
@@ -113,6 +115,13 @@ static void yaboot_finish(struct conf_context *conf)
        /* populate the boot option from state data */
        state->opt->boot_image = create_yaboot_devpath_resource(state,
                                conf, state->boot_image);
+
+       char* args_sigfile_default = talloc_asprintf(opt,
+               "%s.cmdline.sig", state->boot_image);
+       state->opt->args_sig_file = create_yaboot_devpath_resource(state,
+                               conf, args_sigfile_default);
+       talloc_free(args_sigfile_default);
+
        if (state->initrd) {
                state->opt->initrd = create_yaboot_devpath_resource(state,
                                conf, state->initrd);
@@ -163,6 +172,7 @@ static void yaboot_finish(struct conf_context *conf)
                state->opt->option->is_default = true;
 
        discover_context_add_boot_option(conf->dc, state->opt);
+       state->opt = NULL;
 }
 
 static void yaboot_process_pair(struct conf_context *conf, const char *name,
@@ -192,14 +202,10 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name,
        if (!state->globals_done && conf_set_global_option(conf, name, value))
                return;
 
-       if (!conf_param_in_list(state->known_names, name))
-               return;
-
-       state->globals_done = 1;
-
        /* image */
-
        if (streq(name, "image")) {
+               /* an image section finishes our global defintions */
+               state->globals_done = 1;
 
                /* First finish any previous image. */
                if (opt)
@@ -243,7 +249,7 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name,
 
        /* all other processing requires an image */
        if (!opt) {
-               pb_log("%s: unknown name: %s\n", __func__, name);
+               pb_debug("%s: unknown name: %s\n", __func__, name);
                return;
        }
 
@@ -309,7 +315,7 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name,
                return;
        }
 
-       pb_log("%s: unknown name: %s\n", __func__, name);
+       pb_debug("%s: unknown name: %s\n", __func__, name);
 }
 
 static struct conf_global_option yaboot_global_options[] = {
@@ -328,35 +334,21 @@ static struct conf_global_option yaboot_global_options[] = {
 static const char *const yaboot_conf_files[] = {
        "/yaboot.conf",
        "/yaboot.cnf",
+       "/etc/lilo.conf",
+       "/etc/silo.conf",
        "/etc/yaboot.conf",
        "/etc/yaboot.cnf",
        "/suseboot/yaboot.cnf",
        "/YABOOT.CONF",
        "/YABOOT.CNF",
+       "/ETC/LILO.CONF",
+       "/ETC/SILO.CONF",
        "/ETC/YABOOT.CONF",
        "/ETC/YABOOT.CNF",
        "/SUSEBOOT/YABOOT.CNF",
        NULL
 };
 
-static const char *yaboot_known_names[] = {
-       "append",
-       "image",
-       "image[64bit]", /* SUSE extension */
-       "image[32bit]", /* SUSE extension */
-       "initrd",
-       "initrd-size",
-       "label",
-       "literal",
-       "ramdisk",
-       "read-only",
-       "read-write",
-       "root",
-       "device",
-       "partition",
-       NULL
-};
-
 static int yaboot_parse(struct discover_context *dc)
 {
        const char * const *filename;
@@ -382,8 +374,6 @@ static int yaboot_parse(struct discover_context *dc)
        conf->finish = yaboot_finish;
        conf->parser_info = state = talloc_zero(conf, struct yaboot_state);
 
-       state->known_names = yaboot_known_names;
-
        state->opt = NULL;
 
        for (filename = yaboot_conf_files; *filename; filename++) {
@@ -392,6 +382,9 @@ static int yaboot_parse(struct discover_context *dc)
                        continue;
 
                conf_parse_buf(conf, buf, len);
+               device_handler_status_dev_info(dc->handler, dc->device,
+                               _("Parsed yaboot configuration from %s"),
+                               *filename);
                talloc_free(buf);
        }