[asterisk-commits] russell: trunk r85541 - in /trunk: ./ pbx/pbx_config.c

[SVN commits to the Asterisk project]

Author: russell
Date: Sun Oct 14 10:34:54 2007
New Revision: 85541

URL: http://svn.digium.com/view/asterisk?view=rev&rev=85541
Log:
Merged revisions 85540 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r85540 | russell | 2007-10-14 10:24:52 -0500 (Sun, 14 Oct 2007) | 7 lines

Don't create the context for users in users.conf until we know at least one user exists.

(closes issue #10971)
Reported by: dimas
Patches: 
      pbxconfig.patch uploaded by dimas (license 88)

........

Modified:
    trunk/   (props changed)
    trunk/pbx/pbx_config.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_config.c?view=diff&rev=85541&r1=85540&r2=85541
==============================================================================
--- trunk/pbx/pbx_config.c (original)
+++ trunk/pbx/pbx_config.c Sun Oct 14 10:34:54 2007
@@ -1543,14 +1543,11 @@
 	int len;
 	int hasvoicemail;
 	int start, finish, x;
-	struct ast_context *con;
+	struct ast_context *con = NULL;
 	struct ast_flags config_flags = { 0 };
 	
 	cfg = ast_config_load("users.conf", config_flags);
 	if (!cfg)
-		return;
-	con = ast_context_find_or_create(&local_contexts, userscontext, registrar);
-	if (!con)
 		return;
 
 	for (cat = ast_category_browse(cfg, NULL); cat ; cat = ast_category_browse(cfg, cat)) {
@@ -1603,6 +1600,16 @@
 			}
 		}
 		if (!ast_strlen_zero(iface)) {
+			/* Only create a context here when it is really needed. Otherwise default empty context
+			created by pbx_config may conflict with the one explicitly created by pbx_ael */
+			if (!con)
+				con = ast_context_find_or_create(&local_contexts, userscontext, registrar);
+
+			if (!con) {
+				ast_log(LOG_ERROR, "Can't find/create user context '%s'\n", userscontext);
+				return;
+			}
+
 			/* Add hint */
 			ast_add_extension2(con, 0, cat, -1, NULL, NULL, iface, NULL, NULL, registrar);
 			/* If voicemail, use "stdexten" else use plain old dial */