[asterisk-commits] mnicholson: trunk r286759 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Tue Sep 14 14:29:43 2010
New Revision: 286759

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=286759
Log:
Merged revisions 286758 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r286758 | mnicholson | 2010-09-14 14:28:38 -0500 (Tue, 14 Sep 2010) | 27 lines
  
  Merged revisions 286757 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r286757 | mnicholson | 2010-09-14 14:27:28 -0500 (Tue, 14 Sep 2010) | 20 lines
    
    Merged revisions 286756 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r286756 | mnicholson | 2010-09-14 14:26:18 -0500 (Tue, 14 Sep 2010) | 13 lines
      
      Don't clear the username from a realtime database when a registration expires.
      
      Non-realtime chan_sip does not clear the username from memory when a registration expiries so realtime probably shouldn't either.
      
      (closes issue #17551)
      Reported by: ricardolandim
      Patches:
            reg-expiry-username-1.4-fix1.diff uploaded by mnicholson (license 96)
            reg-expiry-username-1.6.2-fix1.diff uploaded by mnicholson (license 96)
            reg-expiry-username-1.8-fix1.diff uploaded by mnicholson (license 96)
            reg-expiry-username-trunk-fix1.diff uploaded by mnicholson (license 96)
      Tested by: ricardolandim, mnicholson
    ........
  ................
................

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=286759&r1=286758&r2=286759
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Sep 14 14:29:43 2010
@@ -12690,7 +12690,7 @@
 
 	if (!sip_cfg.ignore_regexpire) {
 		if (peer->rt_fromcontact && sip_cfg.peer_rtupdate) {
-			ast_update_realtime(tablename, "name", peer->name, "fullcontact", "", "ipaddr", "", "port", "", "regseconds", "0", peer->deprecated_username ? "username" : "defaultuser", "", "regserver", "", "useragent", "", "lastms", "", SENTINEL);
+			ast_update_realtime(tablename, "name", peer->name, "fullcontact", "", "ipaddr", "", "port", "", "regseconds", "0", "regserver", "", "useragent", "", "lastms", "", SENTINEL);
 		} else {
 			ast_db_del("SIP/Registry", peer->name);
 			ast_db_del("SIP/PeerMethods", peer->name);