diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-03 19:17:55 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-03 19:17:55 +0000 |
| commit | f5e54f94e0edade6f5b93f47e05f6562b156f29d (patch) | |
| tree | 369505d6601aa752c5819982a506d4ef6bafaacd | |
| parent | 29c145755b4f07d2c578d74eb03c6193bd0b1bb3 (diff) | |
Merged revisions 59939 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r59939 | russell | 2007-04-03 14:16:53 -0500 (Tue, 03 Apr 2007) | 12 lines
Merged revisions 59938 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r59938 | russell | 2007-04-03 14:15:04 -0500 (Tue, 03 Apr 2007) | 4 lines
Don't attempt to report configuration errors in build_user(). oej pointed out
that for a "friend" entry, this won't work, because all user options are valid
for peers, but not the other way around.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@59940 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 69b12cff8..2230e71de 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -16557,8 +16557,10 @@ static struct sip_user *build_user(const char *name, struct ast_variable *v, int user->maxcallbitrate = atoi(v->value); if (user->maxcallbitrate < 0) user->maxcallbitrate = default_maxcallbitrate; - } else if (strcasecmp(v->name, "type")) - ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno); + } + /* We can't just report unknown options here because this may be a + * type=friend entry. All user options are valid for a peer, but not + * the other way around. */ } ast_copy_flags(&user->flags[0], &userflags[0], mask[0].flags); ast_copy_flags(&user->flags[1], &userflags[1], mask[1].flags); |