[asterisk-commits] tilghman: trunk r303861 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jan 25 12:56:23 2011
New Revision: 303861

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=303861
Log:
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
  ........
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=303861&r1=303860&r2=303861
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Jan 25 12:56:23 2011
@@ -16744,6 +16744,9 @@
 		}
 		ao2_unlock(user);
 		unref_peer(user, "complete sip user");
+		if (result) {
+			break;
+		}
 	}
 	ao2_iterator_destroy(&user_iter);
 	return result;