diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-03 19:16:53 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-03 19:16:53 +0000 |
| commit | b4d47a7200f9429e92688ce4c854dc1112b40b5d (patch) | |
| tree | 1d1bd3cc119e3a80112a818734d2677fc7395032 | |
| parent | 0c2cd0d5d58c5825d288a4e421fe7f0594801b57 (diff) | |
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/branches/1.4@59939 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 bdffb8b26..9b71d0c61 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -15851,8 +15851,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); |