From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 3 Apr 2007 19:15:04 +0000 (+0000)
Subject: Don't attempt to report configuration errors in build_user().  oej pointed out
X-Git-Tag: 1.2.18~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2377111578cd18e01de69b5800af570d5556a14;p=thirdparty%2Fasterisk.git

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/branches/1.2@59938 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 2f5c9cb119..1221cd7e0d 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);