[asterisk-commits] rmudgett: branch rmudgett/bridge_phase r392811 - /team/rmudgett/bridge_phase/...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Jun 24 20:10:41 2013
New Revision: 392811

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=392811
Log:
Remove agents users.conf support notes.  It will not be supported.

Modified:
    team/rmudgett/bridge_phase/apps/app_agent_pool.c

Modified: team/rmudgett/bridge_phase/apps/app_agent_pool.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/apps/app_agent_pool.c?view=diff&rev=392811&r1=392810&r2=392811
==============================================================================
--- team/rmudgett/bridge_phase/apps/app_agent_pool.c (original)
+++ team/rmudgett/bridge_phase/apps/app_agent_pool.c Mon Jun 24 20:10:41 2013
@@ -339,37 +339,12 @@
 };
 
 /*
+ * Move this note into config framework and create an issue.
+ *
  * BUGBUG must fix config framework loading of multiple files.
  *
  * A reload with multiple files must reload all files if any
  * file has been touched.
- */
-/*
- * BUGBUG chan_agent stupidly deals with users.conf.  Remove agent users.conf support.
- *
- * Agents built by users.conf will use defaults except for the
- * three parameters obtained from users.conf.  Also any agent
- * declared by users.conf must not already be declared by
- * agents.conf.
- *
- * [general]
- * hasagent = yes/no (global [user] hasagent=yes value)
- *
- * [user] <- agent-id/username
- * hasagent = yes/no
- * fullname=name
- *
- *static struct aco_file users_conf = {
- *	.filename = "users.conf",
- *	.preload = { "general", NULL }
- *	.types = ACO_TYPES(&users_type, &users_general_type),
- *};
- *
- *  .files = ACO_FILES(&agents_conf, &users_conf),
- *
- * Will need a preapply config function to create valid users.conf
- * agents in the master agents config container.
- * See verify_default_profiles();
  */
 
 static AO2_GLOBAL_OBJ_STATIC(cfg_handle);
@@ -499,8 +474,6 @@
 	aco_option_register_custom(&cfg_info, "savecallsin", ACO_EXACT, agent_types, "", agent_savecallsin_handler, 0);
 	aco_option_register_custom(&cfg_info, "custom_beep", ACO_EXACT, agent_types, "beep", agent_custom_beep_handler, 0);
 	aco_option_register(&cfg_info, "fullname", ACO_EXACT, agent_types, "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct agent_cfg, full_name));
-
-	/*! \todo BUGBUG load_config() needs users.conf handling. */
 
 	if (aco_process_config(&cfg_info, 0) == ACO_PROCESS_ERROR) {
 		goto error;
@@ -1425,7 +1398,7 @@
  * The agent may not have gotten pushed into the holding bridge yet if just look at agent->logged.
  *
  * if agent->state == AGENT_STATE_READY_FOR_CALL
- * 
+ *
  * After custom_beep plays, the beep callback needs to determine if call must be acked or not.
  * if (ast_test_flag(agent, AGENT_FLAG_ACK_CALL) ? agent->override_ack_call : agent->cfg->ack_call)
  */