automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@59989 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 6bb976afb70247f8c43d48db3b590c678af169cd..0f98c402adf55b47277466cafad410ed124fd92f 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12453,8 +12453,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);