automerge commit

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

diff --git a/app.c b/app.c
index a477769042f8208bc9336b8daab767cd2dee80dd..bbd3bfdad68014727ebd2b73122cb2db149869fe 100644 (file)
--- a/app.c
+++ b/app.c
@@ -84,14 +84,11 @@ int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect,
                        ast_playtones_stop(chan);
                if (res < 1)
                        break;
+               if (res == '#')
+                       break;
                collect[x++] = res;
-               if (!ast_matchmore_extension(chan, context, collect, 1, chan->cid.cid_num)) {
-                       if (collect[x-1] == '#') {
-                               /* Not a valid extension, ending in #, assume the # was to finish dialing */
-                               collect[x-1] = '\0';
-                       }
+               if (!ast_matchmore_extension(chan, context, collect, 1, chan->cid.cid_num))
                        break;
-               }
        }
        if (res >= 0) {
                if (ast_exists_extension(chan, context, collect, 1, chan->cid.cid_num))

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 0e968fd05ece7d07c5f5e6aac14e823f9fde4d2e..6bb976afb70247f8c43d48db3b590c678af169cd 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12453,10 +12453,8 @@ 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 %s\n", v->name);
-                */
+               } 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;
        }
        ast_copy_flags(user, &userflags, mask.flags);
@@ -12739,11 +12737,9 @@ 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 %s\n", v->name);
-                */
-               v=v->next;
+               } 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) {
                time_t nowtime;
@@ -13038,10 +13034,8 @@ static int reload_config(void)
                        }
                } else if (!strcasecmp(v->name, "callevents")) {
                        callevents = ast_true(v->value);
-               }
-               /* else if (strcasecmp(v->name,"type"))
-                *      ast_log(LOG_WARNING, "Ignoring %s\n", v->name);
-                */
+               } else
+                       ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno);
                 v = v->next;
        }
 
@@ -13056,7 +13050,8 @@ 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;
        }