[svn-commits] twilson: trunk r319564 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Wed May 18 15:25:32 2011
New Revision: 319564

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

........
  r319552 | twilson | 2011-05-18 13:22:36 -0700 (Wed, 18 May 2011) | 11 lines
  
  Unbreak the storing of registrations for restart
  
  The fix for issue 18882 broke retrieving non-realtime peers from the ast_db
  on restart/reload. This patch tries to unbreak things while leaving the intent
  of the original fix intact.
  (closes issue #19318)
  Reported by: remiq
  Patches: 
        diff.txt uploaded by twilson (license 396)
  Tested by: lmadsen, remiq
........

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=319564&r1=319563&r2=319564
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed May 18 15:25:32 2011
@@ -27089,7 +27089,7 @@
 		sip_cfg.allowsubscribe = TRUE;	/* No global ban any more */
 	}
 	/* If read-only RT backend, then refresh from local DB cache */
-	if (peer->host_dynamic && !sip_cfg.peer_rtupdate) {
+	if (peer->host_dynamic && (!peer->is_realtime || !sip_cfg.peer_rtupdate)) {
 		reg_source_db(peer);
 	}