diff options
| author | Walter Doekes <walter+asterisk@wjd.nu> | 2011-11-01 19:53:26 +0000 |
|---|---|---|
| committer | Walter Doekes <walter+asterisk@wjd.nu> | 2011-11-01 19:53:26 +0000 |
| commit | 25ee5f83b5c9e77be328a92b430d911396f1ac29 (patch) | |
| tree | d3c2949ed347c59f61bc00c6df33a71f68332796 /main/config.c | |
| parent | ed1e02a4d35a66697c8c73432c493b155d638c1b (diff) | |
Cleanup references to sipusers and sipfriends dynamic realtime families
Somewhere between 1.4 and 1.8 the sipusers family has become completely
unused. Before that, the sipfriends family had been obsoleted in favor
of separate sipusers and sippeers families. Apparently, they have been
merged back again into a single family which is now called "sippeers".
Reviewed by: irroot, oej, pabelanger
Review: https://reviewboard.asterisk.org/r/1523
........
Merged revisions 342869 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 342870 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/config.c')
| -rw-r--r-- | main/config.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/main/config.c b/main/config.c index 6381a53f5..23d98da8a 100644 --- a/main/config.c +++ b/main/config.c @@ -2146,8 +2146,7 @@ int read_config_maps(void) if (!driver || !database) continue; if (!strcasecmp(v->name, "sipfriends")) { - ast_log(LOG_WARNING, "The 'sipfriends' table is obsolete, update your config to use sipusers and sippeers, though they can point to the same table.\n"); - append_mapping("sipusers", driver, database, table ? table : "sipfriends", pri); + ast_log(LOG_WARNING, "The 'sipfriends' table is obsolete, update your config to use sippeers instead.\n"); append_mapping("sippeers", driver, database, table ? table : "sipfriends", pri); } else if (!strcasecmp(v->name, "iaxfriends")) { ast_log(LOG_WARNING, "The 'iaxfriends' table is obsolete, update your config to use iaxusers and iaxpeers, though they can point to the same table.\n"); |