diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-26 15:27:45 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-26 15:27:45 +0000 |
commit | 98aa2809e24755d37575898cbc0d9d70ccf53a58 (patch) | |
tree | a15ed68ba63469421217ec764cd1b65c252dd3dd | |
parent | 2c802534923fbb2a12a75b0cbff0630afffc358d (diff) |
Merged revisions 38234 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r38234 | file | 2006-07-26 11:26:06 -0400 (Wed, 26 Jul 2006) | 2 lines
Put default callerid into contact when the one specified is either NULL or has a zero string length. (issue #7590 reported by key2)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@38235 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index f3ff61504..4020957b8 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -6286,7 +6286,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho l = CALLERID_UNKNOWN; n = l; } - if (!l) + if (ast_strlen_zero(l)) l = default_callerid; if (ast_strlen_zero(n)) n = l; |