Merge remote branch 'origin/master'

Conflicts:
	src/main.c

diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c
index b5a01d55ec5e5c4e1eaa0dde3bb4b4d5a4afc884..1984cd5bfb29d818a9d8ee768808ee719dc8c403 100644 (file)
--- a/src/action_list_graphs.c
+++ b/src/action_list_graphs.c
@@ -85,8 +85,6 @@ static int print_all_graphs (__attribute__((unused)) void *user_data) /* {{{ */
 
 int action_list_graphs (void) /* {{{ */
 {
-  gl_update ();
-
   page_callbacks_t pg_callbacks = PAGE_CALLBACKS_INIT;
   char title[512];
 

diff --git a/src/action_list_hosts.c b/src/action_list_hosts.c
index d1cae717313729dc5abcb5258bf40e41b349b80d..0e7b963187e1202444bc31267ef388b5e13a3b86 100644 (file)
--- a/src/action_list_hosts.c
+++ b/src/action_list_hosts.c
@@ -73,8 +73,6 @@ static int print_all_hosts (__attribute__((unused)) void *user_data) /* {{{ */
 
 int action_list_hosts (void) /* {{{ */
 {
-  gl_update ();
-
   page_callbacks_t pg_callbacks = PAGE_CALLBACKS_INIT;
   char title[512];
 

diff --git a/src/action_search.c b/src/action_search.c
index c2dd378e758dee1beb965391079e1cfa5c3f0ea4..27b6a0efb2e700d18c5c83431bc3d18dbc9abc0c 100644 (file)
--- a/src/action_search.c
+++ b/src/action_search.c
@@ -265,8 +265,6 @@ int action_search (void) /* {{{ */
   page_data_t pg_data;
   int status;
 
-  gl_update ();
-
   pg_data.search_term = strtolower_copy (param ("q"));
   if ((pg_data.search_term != NULL) && (pg_data.search_term[0] == 0))
   {

diff --git a/src/action_search_json.c b/src/action_search_json.c
index 6fcfa67c5e50cfb7257b19a8942eef161e866731..834e07e83f339739198d379438ba3ad2675ea386 100644 (file)
--- a/src/action_search_json.c
+++ b/src/action_search_json.c
@@ -164,8 +164,6 @@ int action_search_json (void) /* {{{ */
   char *search;
   int status;
 
-  gl_update ();
-
   search = strtolower_copy (param ("q"));
 
   status = list_graphs_json (search);

diff --git a/src/graph_def.c b/src/graph_def.c
index e7effec20d496a0a6705e1bab8b6132c5a8804bd..b3589059a5b3b57f6bb24c436152f0356e4563fc 100644 (file)
--- a/src/graph_def.c
+++ b/src/graph_def.c
@@ -194,7 +194,7 @@ graph_def_t *def_create (graph_config_t *cfg, graph_ident_t *ident, /* {{{ */
   ret->next = NULL;
 
   ret->select = ident_copy_with_selector (selector, ident,
-      IDENT_FLAG_REPLACE_ANY);
+      IDENT_FLAG_REPLACE_ALL);
   if (ret->select == NULL)
   {
     fprintf (stderr, "def_create: ident_copy_with_selector failed\n");

diff --git a/src/main.c b/src/main.c
index 74d5d27e2b334e53920b4555cd7650efd7346fa0..470d67d2b22074bc9439e00667351683eed879f7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -114,7 +114,10 @@ static int handle_request (void) /* {{{ */
     for (i = 0; i < actions_num; i++)
     {
       if (strcmp (action, actions[i].name) == 0)
+      {
         status = (*actions[i].callback) ();
+        break;
+      }
     }
 
     if (i >= actions_num)