Merge "realtime: Fix ast_load_realtime_multientry handling"

1 files changed, 7 insertions, 6 deletions

diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c
index 08c90aa62..6f5d13738 100644
--- a/pbx/pbx_realtime.c
+++ b/pbx/pbx_realtime.c
@@ -189,25 +189,26 @@ static struct ast_variable *realtime_switch_common(const char *table, const char
 	if (!var && !ast_test_flag(&flags, OPTION_PATTERNS_DISABLED)) {
 		cfg = ast_load_realtime_multientry(table, "exten LIKE", "\\_%", "context", context, "priority", pri, SENTINEL);	
 		if (cfg) {
-			char *cat = ast_category_browse(cfg, NULL);
+			char *cat = NULL;
+
+			while ((cat = ast_category_browse(cfg, cat))) {
+				const char *realtime_exten = ast_variable_retrieve(cfg, cat, "exten");
 
-			while(cat) {
 				switch(mode) {
 				case MODE_MATCHMORE:
-					match = ast_extension_close(cat, exten, 1);
+					match = ast_extension_close(realtime_exten, exten, 1);
 					break;
 				case MODE_CANMATCH:
-					match = ast_extension_close(cat, exten, 0);
+					match = ast_extension_close(realtime_exten, exten, 0);
 					break;
 				case MODE_MATCH:
 				default:
-					match = ast_extension_match(cat, exten);
+					match = ast_extension_match(realtime_exten, exten);
 				}
 				if (match) {
 					var = ast_category_detach_variables(ast_category_get(cfg, cat, NULL));
 					break;
 				}
-				cat = ast_category_browse(cfg, cat);
 			}
 			ast_config_destroy(cfg);
 		}