diff options
author | Terry Wilson <twilson@digium.com> | 2011-01-12 21:24:18 +0000 |
---|---|---|
committer | Terry Wilson <twilson@digium.com> | 2011-01-12 21:24:18 +0000 |
commit | c6858b9a1d2a660175674fcdaeb3be42850bef45 (patch) | |
tree | c187ecfc28dcd8a2f99efe73b53569b250699885 | |
parent | 8ad7304e66a2b7169c8c66ac70cb50860568feb3 (diff) |
Merged revisions 301683 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r301683 | twilson | 2011-01-12 15:19:48 -0600 (Wed, 12 Jan 2011) | 15 lines
Merged revisions 301682 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r301682 | twilson | 2011-01-12 15:05:02 -0600 (Wed, 12 Jan 2011) | 9 lines
Don't reject all SUBSCRIBE auth requests
When merging another SUBSCRIBE fix from 1.4, some braces were put in
the wrong place. This patch fixes that.
(closes issue #18597)
Reported by: thsgmbh
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301684 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 289cf82c6..f57479912 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -23394,10 +23394,10 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req, ast_log(LOG_NOTICE, "Failed to authenticate device %s for SUBSCRIBE\n", get_header(req, "From")); transmit_response_reliable(p, "403 Forbidden", req); } - } - pvt_set_needdestroy(p, "authentication failed"); - return 0; + pvt_set_needdestroy(p, "authentication failed"); + return 0; + } } /* At this point, authpeer cannot be NULL. Remember we hold a reference, |