diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-03 19:15:04 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-03 19:15:04 +0000 |
| commit | 5b4da3b22219a2697413c194ea24fb7bee65a7fe (patch) | |
| tree | 1b6f52181d4da6b2d56fdb68d218e1b2a6f3de80 /channels/chan_sip.c | |
| parent | aeacb7e316f5a5e698e11f599ceba8f6a3eb2338 (diff) | |
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.2@59938 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_sip.c')
| -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 2f5c9cb11..1221cd7e0 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -12343,8 +12343,10 @@ static struct sip_user *build_user(const char *name, struct ast_variable *v, int user->callingpres = ast_parse_caller_presentation(v->value); if (user->callingpres == -1) user->callingpres = atoi(v->value); - } 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. */ v = v->next; } ast_copy_flags(user, &userflags, mask.flags); |