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: https://origsvn.digium.com/svn/asterisk/trunk@59940 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 69b12cf..2230e71 100644 (file)
--- 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);