From: Terry Wilson <twilson@digium.com>
Date: Wed, 18 May 2011 20:22:36 +0000 (+0000)
Subject: Unbreak the storing of registrations for restart
X-Git-Tag: 1.8.5-rc1~11^2~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0219829eef97b7faadd9b73b20a5278ac6ce9dd1;p=thirdparty%2Fasterisk.git

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


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index cf2baa1e2f..9d0ea32b64 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -26740,7 +26740,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
 		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);
 	}