[settings] Avoid duplicate settings block names

[people/mcb30/gpxe.git] / src / core / settings.c

diff --git a/src/core/settings.c b/src/core/settings.c
index 09033bd..2c886fd 100644 (file)
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -183,12 +183,17 @@ static void reprioritise_settings ( struct settings *settings ) {
  * @ret rc             Return status code
  */
 int register_settings ( struct settings *settings, struct settings *parent ) {
  * @ret rc             Return status code
  */
 int register_settings ( struct settings *settings, struct settings *parent ) {

+       struct settings *old_settings;

 
        /* NULL parent => add to settings root */
        assert ( settings != NULL );
        if ( parent == NULL )
                parent = &settings_root;
 
 
        /* NULL parent => add to settings root */
        assert ( settings != NULL );
        if ( parent == NULL )
                parent = &settings_root;
 

+       /* Remove any existing settings with the same name */
+       if ( ( old_settings = find_child_settings ( parent, settings->name ) ))
+               unregister_settings ( old_settings );
+

        /* Add to list of settings */
        ref_get ( settings->refcnt );
        ref_get ( parent->refcnt );
        /* Add to list of settings */
        ref_get ( settings->refcnt );
        ref_get ( parent->refcnt );