summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2011-01-25 18:56:23 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2011-01-25 18:56:23 +0000
commit50c432324b81580e839606c142ebae5a0fcf68ae (patch)
tree44846d5124f11cd1b19b626ab22d7c1cb2a5116a /channels
parent7889af7cab950b993917d1d727780c1eb95c829d (diff)
Merged revisions 303860 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r303860 | tilghman | 2011-01-25 12:55:27 -0600 (Tue, 25 Jan 2011) | 12 lines Merged revisions 303858 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r303858 | tilghman | 2011-01-25 12:41:26 -0600 (Tue, 25 Jan 2011) | 5 lines Fix "sip show user <tab>", so that it actually shows results, instead of just completing the last entry. (closes issue #16675) Reported by: pj ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303861 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e7de57927..38b390585 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16744,6 +16744,9 @@ static char *complete_sip_user(const char *word, int state)
}
ao2_unlock(user);
unref_peer(user, "complete sip user");
+ if (result) {
+ break;
+ }
}
ao2_iterator_destroy(&user_iter);
return result;