automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@61425 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 7 deletions

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index eca592bd4..984dd947f 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12740,8 +12740,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int
 				ast_log(LOG_WARNING, "Qualification of peer '%s' should be 'yes', 'no', or a number of milliseconds at line %d of sip.conf\n", peer->name, v->lineno);
 				peer->maxms = 0;
 			}
-		} 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);
+		}
 		v = v->next;
 	}
 	if (!ast_test_flag((&global_flags_page2), SIP_PAGE2_IGNOREREGEXPIRE) && ast_test_flag(&peer->flags_page2, SIP_PAGE2_DYNAMIC) && realtime) {
@@ -13037,9 +13036,8 @@ static int reload_config(void)
 			}
 		} else if (!strcasecmp(v->name, "callevents")) {
 			callevents = ast_true(v->value);
-		} else
-			ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno);
-		 v = v->next;
+		}
+		v = v->next;
 	}
 
 	if (!allow_external_domains && AST_LIST_EMPTY(&domain_list)) {
@@ -13053,8 +13051,7 @@ static int reload_config(void)
  		/* Format for authentication is auth = username:password@realm */
  		if (!strcasecmp(v->name, "auth")) {
  			authl = add_realm_authentication(authl, v->value, v->lineno);
- 		} else
-			ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno);
+ 		}
  		v = v->next;
  	}